[pkg-bacula-commits] [bacula] 01/01: Imported upstream version 7.2.1~git2016013
Carsten Leonhardt
leo at moszumanska.debian.org
Thu Jan 14 14:26:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
leo pushed a commit to branch upstream
in repository bacula.
commit cc6946b9bcf02c48580fe394ed39562da91b29fd
Author: Carsten Leonhardt <leo at debian.org>
Date: Thu Jan 14 15:25:04 2016 +0100
Imported upstream version 7.2.1~git2016013
Corresponds to upstream git up to commit
d181bc7397d3778d173cfe784ba34c3c09745d42
Changes from upstream:
src/lib/sha1.{h,c}: (#658326) remove, DFSG-nonfree, RFC 3174
---
AUTHORS | 3 +
autoconf/acconfig.h | 1 +
autoconf/bacula-macros/os.m4 | 8 +
autoconf/config.h.in | 1 +
po/POTFILES.in | 3 +-
po/bacula.pot | 192 +++---
po/de.po | 194 +++---
po/es.po | 194 +++---
po/es_AR.po | 26 +-
po/fi.po | 2 +-
po/fr.po | 214 +++----
po/it.po | 420 +------------
po/nl.po | 194 +++---
po/pl.po | 883 +--------------------------
po/sv.po | 194 +++---
po/uk.po | 194 +++---
scripts/Makefile.in | 2 +-
scripts/bacula-ctl-dir.in | 101 ++-
scripts/bacula-ctl-fd.in | 99 ++-
scripts/bacula-ctl-sd.in | 99 ++-
scripts/bacula.in | 5 +-
scripts/bconsole.in | 3 +-
scripts/breload.in | 2 +-
scripts/btraceback.in | 2 +-
scripts/devel_bacula.in | 2 +-
scripts/disk-changer.in | 235 ++++---
scripts/dvd-handler.in | 343 ++++++-----
scripts/dvd-simulator.in | 281 +++++----
scripts/logrotate.in | 2 +-
scripts/manual_prune.pl | 6 +-
scripts/mtx-changer.in | 141 +++--
src/cats/bdb.h | 3 +-
src/cats/bdb_mysql.h | 117 ++--
src/cats/bvfs.c | 2 +-
src/cats/bvfs.h | 3 +-
src/cats/cats.c | 2 +-
src/cats/cats.h | 3 +-
src/cats/cats_null.c | 2 +-
src/cats/mysql.c | 2 +-
src/cats/postgresql.c | 2 +-
src/cats/protos.h | 3 +-
src/cats/sql.c | 3 +-
src/cats/sql_cmds.c | 9 +
src/cats/sql_cmds.h | 4 +-
src/cats/sql_create.c | 8 +-
src/cats/sql_delete.c | 2 +-
src/cats/sql_find.c | 2 +-
src/cats/sql_get.c | 7 +-
src/cats/sql_list.c | 19 +-
src/cats/sql_update.c | 2 +-
src/cats/sqlite.c | 2 +-
src/console/authenticate.c | 2 +-
src/console/conio.c | 2 +-
src/console/conio.h | 2 +-
src/console/console.c | 2 +-
src/console/console_conf.c | 2 +-
src/console/console_conf.h | 2 +-
src/console/func.h | 2 +-
src/dird/vbackup.c | 2 +-
src/filed/filed.c | 2 +-
src/filed/heartbeat.c | 3 +-
src/filed/hello.c | 3 +-
src/filed/xattr.h | 6 +-
src/findlib/fstype.c | 69 +--
src/lib/address_conf.c | 3 +-
src/lib/address_conf.h | 3 +-
src/lib/alist.c | 3 +-
src/lib/alist.h | 3 +-
src/lib/attr.c | 3 +-
src/lib/attr.h | 3 +-
src/lib/base64.c | 3 +-
src/lib/base64.h | 3 +-
src/lib/berrno.c | 3 +-
src/lib/berrno.h | 3 +-
src/lib/bget_msg.c | 3 +-
src/lib/bget_msg.h | 3 +-
src/lib/binflate.c | 3 +-
src/lib/bits.h | 3 +-
src/lib/bnet.c | 29 +-
src/lib/bnet_server.c | 3 +-
src/lib/bpipe.c | 3 +-
src/lib/bpipe.h | 3 +-
src/lib/breg.c | 3 +-
src/lib/breg.h | 3 +-
src/lib/bregex.c | 4 +-
src/lib/bregex.h | 3 +-
src/lib/bsnprintf.c | 3 +-
src/lib/bsock.c | 3 +-
src/lib/bsock.h | 3 +-
src/lib/bsys.c | 3 +-
src/lib/btime.c | 3 +-
src/lib/btime.h | 3 +-
src/lib/btimers.c | 3 +-
src/lib/btimers.h | 3 +-
src/lib/cram-md5.c | 3 +-
src/lib/crypto.c | 3 +-
src/lib/crypto.h | 3 +-
src/lib/daemon.c | 13 +-
src/lib/devlock.c | 3 +-
src/lib/devlock.h | 3 +-
src/lib/dlist.c | 3 +-
src/lib/dlist.h | 3 +-
src/lib/edit.c | 3 +-
src/lib/guid_to_name.c | 3 +-
src/lib/guid_to_name.h | 3 +-
src/lib/hmac.c | 3 +-
src/lib/htable.c | 3 +-
src/lib/htable.h | 7 +-
src/lib/ini.c | 3 +-
src/lib/ini.h | 3 +-
src/lib/jcr.c | 3 +-
src/lib/lex.c | 3 +-
src/lib/lex.h | 3 +-
src/lib/lib.h | 3 +-
src/lib/lockmgr.c | 3 +-
src/lib/lockmgr.h | 3 +-
src/lib/md5.c | 3 +-
src/lib/md5.h | 3 +-
src/lib/mem_pool.c | 3 +-
src/lib/mem_pool.h | 3 +-
src/lib/message.c | 6 +-
src/lib/message.h | 3 +-
src/lib/mutex_list.h | 3 +-
src/lib/openssl.c | 3 +-
src/lib/openssl.h | 3 +-
src/lib/parse_conf.c | 3 +-
src/lib/parse_conf.h | 3 +-
src/lib/plugins.c | 3 +-
src/lib/plugins.h | 3 +-
src/lib/priv.c | 3 +-
src/lib/protos.h | 3 +-
src/lib/queue.c | 3 +-
src/lib/queue.h | 3 +-
src/lib/rblist.c | 3 +-
src/lib/rblist.h | 3 +-
src/lib/res.c | 3 +-
src/lib/runscript.c | 3 +-
src/lib/runscript.h | 3 +-
src/lib/rwlock.c | 3 +-
src/lib/rwlock.h | 3 +-
src/lib/scan.c | 3 +-
src/lib/sellist.c | 3 +-
src/lib/sellist.h | 3 +-
src/lib/serial.c | 3 +-
src/lib/serial.h | 3 +-
src/lib/signal.c | 3 +-
src/lib/smartall.c | 3 +-
src/lib/smartall.h | 3 +-
src/lib/status.h | 3 +-
src/lib/tls.c | 3 +-
src/lib/tls.h | 3 +-
src/lib/tree.c | 3 +-
src/lib/tree.h | 3 +-
src/lib/util.c | 3 +-
src/lib/var.c | 3 +-
src/lib/waitq.h | 3 +-
src/lib/watchdog.c | 3 +-
src/lib/watchdog.h | 3 +-
src/lib/workq.c | 3 +-
src/lib/workq.h | 3 +-
src/qt-console/bat.h | 3 +-
src/qt-console/bat_conf.cpp | 3 +-
src/qt-console/bat_conf.h | 3 +-
src/qt-console/bcomm/dircomm.cpp | 3 +-
src/qt-console/bcomm/dircomm.h | 3 +-
src/qt-console/bcomm/dircomm_auth.cpp | 3 +-
src/qt-console/clients/clients.cpp | 3 +-
src/qt-console/clients/clients.h | 3 +-
src/qt-console/console/console.cpp | 3 +-
src/qt-console/console/console.h | 3 +-
src/qt-console/fileset/fileset.cpp | 3 +-
src/qt-console/fileset/fileset.h | 3 +-
src/qt-console/help/help.cpp | 3 +-
src/qt-console/help/help.h | 3 +-
src/qt-console/job/job.cpp | 3 +-
src/qt-console/job/job.h | 3 +-
src/qt-console/jobgraphs/jobplot.cpp | 3 +-
src/qt-console/jobgraphs/jobplot.h | 3 +-
src/qt-console/joblist/joblist.cpp | 3 +-
src/qt-console/joblist/joblist.h | 3 +-
src/qt-console/joblog/joblog.cpp | 3 +-
src/qt-console/joblog/joblog.h | 3 +-
src/qt-console/jobs/jobs.cpp | 3 +-
src/qt-console/jobs/jobs.h | 3 +-
src/qt-console/label/label.cpp | 3 +-
src/qt-console/label/label.h | 3 +-
src/qt-console/main.cpp | 3 +-
src/qt-console/mainwin.cpp | 3 +-
src/qt-console/mainwin.h | 3 +-
src/qt-console/mediaedit/mediaedit.cpp | 3 +-
src/qt-console/mediaedit/mediaedit.h | 3 +-
src/qt-console/mediainfo/mediainfo.cpp | 3 +-
src/qt-console/mediainfo/mediainfo.h | 3 +-
src/qt-console/medialist/medialist.cpp | 3 +-
src/qt-console/medialist/medialist.h | 3 +-
src/qt-console/medialist/mediaview.cpp | 7 +-
src/qt-console/medialist/mediaview.h | 3 +-
src/qt-console/mount/mount.cpp | 3 +-
src/qt-console/mount/mount.h | 3 +-
src/qt-console/pages.cpp | 3 +-
src/qt-console/pages.h | 3 +-
src/qt-console/relabel/relabel.cpp | 3 +-
src/qt-console/relabel/relabel.h | 3 +-
src/qt-console/restore/brestore.cpp | 3 +-
src/qt-console/restore/prerestore.cpp | 3 +-
src/qt-console/restore/restore.cpp | 3 +-
src/qt-console/restore/restore.h | 3 +-
src/qt-console/restore/restoretree.cpp | 3 +-
src/qt-console/restore/restoretree.h | 3 +-
src/qt-console/run/estimate.cpp | 3 +-
src/qt-console/run/prune.cpp | 3 +-
src/qt-console/run/run.cpp | 3 +-
src/qt-console/run/run.h | 3 +-
src/qt-console/run/runcmd.cpp | 3 +-
src/qt-console/select/select.cpp | 3 +-
src/qt-console/select/select.h | 3 +-
src/qt-console/select/textinput.cpp | 3 +-
src/qt-console/select/textinput.h | 3 +-
src/qt-console/status/clientstat.cpp | 3 +-
src/qt-console/status/clientstat.h | 3 +-
src/qt-console/status/dirstat.cpp | 3 +-
src/qt-console/status/dirstat.h | 3 +-
src/qt-console/status/storstat.cpp | 3 +-
src/qt-console/status/storstat.h | 3 +-
src/qt-console/storage/content.cpp | 9 +-
src/qt-console/storage/content.h | 3 +-
src/qt-console/storage/storage.cpp | 3 +-
src/qt-console/storage/storage.h | 3 +-
src/qt-console/tray-monitor/authenticate.cpp | 3 +-
src/qt-console/tray-monitor/tray-monitor.cpp | 3 +-
src/qt-console/tray-monitor/tray-monitor.h | 3 +-
src/qt-console/tray-monitor/tray-ui.h | 3 +-
src/qt-console/tray-monitor/tray_conf.cpp | 3 +-
src/qt-console/tray-monitor/tray_conf.h | 3 +-
src/qt-console/util/comboutil.cpp | 3 +-
src/qt-console/util/comboutil.h | 3 +-
src/qt-console/util/fmtwidgetitem.cpp | 12 +-
src/qt-console/util/fmtwidgetitem.h | 3 +-
src/stored/acquire.c | 3 +-
src/stored/ansi_label.c | 3 +-
src/stored/append.c | 3 +-
src/stored/askdir.c | 3 +-
src/stored/authenticate.c | 3 +-
src/stored/autochanger.c | 3 +-
src/stored/bcopy.c | 3 +-
src/stored/bextract.c | 3 +-
src/stored/block.c | 3 +-
src/stored/block.h | 3 +-
src/stored/block_util.c | 3 +-
src/stored/bls.c | 3 +-
src/stored/bscan.c | 3 +-
src/stored/bsr.h | 3 +-
src/stored/btape.c | 3 +-
src/stored/butil.c | 3 +-
src/stored/dev.c | 7 +-
src/stored/dev.h | 3 +-
src/stored/device.c | 3 +-
src/stored/dircmd.c | 3 +-
src/stored/ebcdic.c | 3 +-
src/stored/fd_cmds.c | 3 +-
src/stored/file_dev.c | 3 +-
src/stored/file_dev.h | 3 +-
src/stored/hello.c | 3 +-
src/stored/job.c | 3 +-
src/stored/label.c | 3 +-
src/stored/lock.c | 3 +-
src/stored/lock.h | 3 +-
src/stored/match_bsr.c | 3 +-
src/stored/mount.c | 3 +-
src/stored/os.c | 3 +-
src/stored/parse_bsr.c | 3 +-
src/stored/protos.h | 3 +-
src/stored/read.c | 3 +-
src/stored/read_records.c | 3 +-
src/stored/record.h | 3 +-
src/stored/record_read.c | 3 +-
src/stored/record_util.c | 3 +-
src/stored/record_write.c | 3 +-
src/stored/reserve.c | 3 +-
src/stored/reserve.h | 3 +-
src/stored/scan.c | 3 +-
src/stored/sd_plugins.c | 28 +-
src/stored/sd_plugins.h | 3 +-
src/stored/spool.c | 3 +-
src/stored/status.c | 3 +-
src/stored/stored.c | 3 +-
src/stored/stored.h | 3 +-
src/stored/stored_conf.c | 3 +-
src/stored/stored_conf.h | 3 +-
src/stored/tape_dev.c | 3 +-
src/stored/tape_dev.h | 3 +-
src/stored/vbackup.c | 3 +-
src/stored/vol_mgr.c | 36 +-
src/stored/vol_mgr.h | 3 +-
src/stored/vtape_dev.c | 3 +-
src/stored/vtape_dev.h | 3 +-
src/stored/wait.c | 3 +-
src/tools/bbatch.c | 23 +-
src/tools/bpluginfo.c | 13 +-
src/tools/bregex.c | 3 +-
src/tools/bregtest.c | 3 +-
src/tools/bsnapshot.c | 3 +-
src/tools/bvfs_test.c | 5 +-
src/tools/bwild.c | 3 +-
src/tools/cats_test.c | 7 +-
src/tools/drivetype.c | 3 +-
src/tools/fstype.c | 3 +-
src/tools/testfind.c | 3 +-
src/tools/testls.c | 3 +-
src/version.h | 13 +-
310 files changed, 1868 insertions(+), 3383 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index a0b66c2..27ff6c8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,6 +20,7 @@ Alexander Bergolth
Alexandre Baron
Alexandre Simon
Allan Black
+Ana Emilia Arruda
Andreas Piesk
Andrew Ford
Arno Lehmann
@@ -29,6 +30,7 @@ Bernd Frick
Bill Moran
Bastian Friedrich
Carlos A. Molina G
+Carsten Leonhardt
Carsten Paeth
Chris Lee
Christian Masopust
@@ -120,6 +122,7 @@ Tullio Andreatta
Ulrich Leodolter
Vitaliy Kosharskiy
Victor Hugo dos Santos
+Wanderlei Huttel
Wolfgang Denk
Yuri Timofeev
Yves Orton
diff --git a/autoconf/acconfig.h b/autoconf/acconfig.h
index 3a694a0..310c77f 100644
--- a/autoconf/acconfig.h
+++ b/autoconf/acconfig.h
@@ -137,6 +137,7 @@
/* OSes */
#undef HAVE_LINUX_OS
#undef HAVE_FREEBSD_OS
+#undef HAVE_KFREEBSD_OS
#undef HAVE_NETBSD_OS
#undef HAVE_OPENBSD_OS
#undef HAVE_BSDI_OS
diff --git a/autoconf/bacula-macros/os.m4 b/autoconf/bacula-macros/os.m4
index eb249a6..b82deed 100644
--- a/autoconf/bacula-macros/os.m4
+++ b/autoconf/bacula-macros/os.m4
@@ -160,6 +160,14 @@ then
else
AM_CONDITIONAL(HAVE_DARWIN_OS, $FALSEPRG)
fi
+
+if test $HAVE_UNAME=yes -a x`uname -s` = xGNU/kFreeBSD
+then
+ AM_CONDITIONAL(HAVE_KFREEBSD_OS, $TRUEPRG)
+ AC_DEFINE(HAVE_KFREEBSD_OS)
+else
+ AM_CONDITIONAL(HAVE_KFREEBSD_OS, $FALSEPRG)
+fi
])
AC_DEFUN([BA_CHECK_OPSYS_DISTNAME],
diff --git a/autoconf/config.h.in b/autoconf/config.h.in
index 5cc08b8..f9f1bd9 100644
--- a/autoconf/config.h.in
+++ b/autoconf/config.h.in
@@ -137,6 +137,7 @@
/* OSes */
#undef HAVE_LINUX_OS
#undef HAVE_FREEBSD_OS
+#undef HAVE_KFREEBSD_OS
#undef HAVE_NETBSD_OS
#undef HAVE_OPENBSD_OS
#undef HAVE_BSDI_OS
diff --git a/po/POTFILES.in b/po/POTFILES.in
index acb359e..a605cec 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,6 +39,7 @@ src/findlib/bfile.h
src/findlib/find.h
src/findlib/protos.h
src/findlib/savecwd.h
+src/findlib/win32filter.h
src/jcr.h
src/lib/address_conf.h
src/lib/alist.h
@@ -89,7 +90,6 @@ src/lib/waitq.h
src/lib/watchdog.h
src/lib/workq.h
src/plugins/fd/fd_common.h
-src/plugins/sd/sd_common.h
src/qt-console/bat.h
src/qt-console/bat_conf.cpp
src/qt-console/bat_conf.h
@@ -177,7 +177,6 @@ src/qt-console/util/comboutil.h
src/qt-console/util/fmtwidgetitem.cpp
src/qt-console/util/fmtwidgetitem.h
src/qt-console/win32/qplatformdefs.h
-src/stored/bitarray.h
src/stored/block.h
src/stored/bsr.h
src/stored/dev.h
diff --git a/po/bacula.pot b/po/bacula.pot
index d023595..2dcc06b 100644
--- a/po/bacula.pot
+++ b/po/bacula.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: bacula-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2015-08-09 15:05+0200\n"
+"POT-Creation-Date: 2016-01-10 15:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -27,208 +27,208 @@ msgstr ""
msgid "*None*"
msgstr ""
-#: src/lib/status.h:78
+#: src/lib/status.h:77
msgid ""
"\n"
"Terminated Jobs:\n"
msgstr ""
-#: src/lib/status.h:85
+#: src/lib/status.h:84
msgid " JobId Level Files Bytes Status Finished Name \n"
msgstr ""
-#: src/lib/status.h:87
+#: src/lib/status.h:86
msgid "===================================================================\n"
msgstr ""
-#: src/lib/status.h:107
+#: src/lib/status.h:106
msgid "Created"
msgstr ""
-#: src/lib/status.h:111
+#: src/lib/status.h:110
msgid "Error"
msgstr ""
-#: src/lib/status.h:114
+#: src/lib/status.h:113
msgid "Diffs"
msgstr ""
-#: src/lib/status.h:117
+#: src/lib/status.h:116
msgid "Cancel"
msgstr ""
-#: src/lib/status.h:120
+#: src/lib/status.h:119
msgid "OK"
msgstr ""
-#: src/lib/status.h:123
+#: src/lib/status.h:122
msgid "OK -- with warnings"
msgstr ""
-#: src/lib/status.h:126
+#: src/lib/status.h:125
msgid "Incomplete"
msgstr ""
-#: src/lib/status.h:129
+#: src/lib/status.h:128
msgid "Other"
msgstr ""
-#: src/lib/status.h:141
+#: src/lib/status.h:140
#, c-format
msgid "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n"
msgstr ""
-#: src/lib/status.h:149
+#: src/lib/status.h:148
#, c-format
msgid "%6d %-6s %8s %10s %-7s %-8s %s\n"
msgstr ""
-#: src/lib/status.h:178 src/lib/status.h:189 src/lib/status.h:203
-#: src/lib/status.h:207 src/lib/status.h:211
+#: src/lib/status.h:177 src/lib/status.h:188 src/lib/status.h:202
+#: src/lib/status.h:206 src/lib/status.h:210
msgid "Bacula "
msgstr ""
-#: src/qt-console/bat_conf.cpp:133
+#: src/qt-console/bat_conf.cpp:132
#, c-format
msgid "No record for %d %s\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:142
+#: src/qt-console/bat_conf.cpp:141
#, c-format
msgid "Director: name=%s address=%s DIRport=%d\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:146
+#: src/qt-console/bat_conf.cpp:145
#, c-format
msgid "Console: name=%s\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:149
-#: src/qt-console/tray-monitor/tray_conf.cpp:187
+#: src/qt-console/bat_conf.cpp:148
+#: src/qt-console/tray-monitor/tray_conf.cpp:186
#, c-format
msgid "ConsoleFont: name=%s font face=%s\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:153 src/qt-console/bat_conf.cpp:234
-#: src/qt-console/bat_conf.cpp:284 src/qt-console/bat_conf.cpp:314
+#: src/qt-console/bat_conf.cpp:152 src/qt-console/bat_conf.cpp:233
+#: src/qt-console/bat_conf.cpp:283 src/qt-console/bat_conf.cpp:313
#, c-format
msgid "Unknown resource type %d\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:262
-#: src/qt-console/tray-monitor/tray_conf.cpp:280
+#: src/qt-console/bat_conf.cpp:261
+#: src/qt-console/tray-monitor/tray_conf.cpp:279
#, c-format
msgid "%s item is required in %s resource, but not found.\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:331
-#: src/qt-console/tray-monitor/tray_conf.cpp:364
+#: src/qt-console/bat_conf.cpp:330
+#: src/qt-console/tray-monitor/tray_conf.cpp:363
#, c-format
msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:89
+#: src/qt-console/bcomm/dircomm.cpp:88
#, c-format
msgid "Already connected\"%s\".\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:100
-#: src/qt-console/tray-monitor/tray-monitor.cpp:353
+#: src/qt-console/bcomm/dircomm.cpp:99
+#: src/qt-console/tray-monitor/tray-monitor.cpp:352
#, c-format
msgid "Connecting to Director %s:%d"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:102
+#: src/qt-console/bcomm/dircomm.cpp:101
#, c-format
msgid ""
"Connecting to Director %s:%d\n"
"\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:154
+#: src/qt-console/bcomm/dircomm.cpp:153
#, c-format
msgid "Failed to initialize TLS context for Console \"%s\".\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:177
+#: src/qt-console/bcomm/dircomm.cpp:176
#, c-format
msgid "Failed to initialize TLS context for Director \"%s\".\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:199
-#: src/qt-console/tray-monitor/tray-monitor.cpp:358
+#: src/qt-console/bcomm/dircomm.cpp:198
+#: src/qt-console/tray-monitor/tray-monitor.cpp:357
msgid "Director daemon"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:237
+#: src/qt-console/bcomm/dircomm.cpp:236
msgid "Initializing ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:253 src/qt-console/console/console.cpp:134
+#: src/qt-console/bcomm/dircomm.cpp:252 src/qt-console/console/console.cpp:133
msgid "Connected"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:377
+#: src/qt-console/bcomm/dircomm.cpp:376
msgid "Command completed ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:384 src/qt-console/console/console.cpp:371
+#: src/qt-console/bcomm/dircomm.cpp:383 src/qt-console/console/console.cpp:370
msgid "Processing command ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:391
+#: src/qt-console/bcomm/dircomm.cpp:390
msgid "At main prompt waiting for input ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:398 src/qt-console/bcomm/dircomm.cpp:408
+#: src/qt-console/bcomm/dircomm.cpp:397 src/qt-console/bcomm/dircomm.cpp:407
msgid "At prompt waiting for input ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:416
+#: src/qt-console/bcomm/dircomm.cpp:415
msgid "Command failed."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:488
+#: src/qt-console/bcomm/dircomm.cpp:487
msgid "Director disconnected."
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:111
+#: src/qt-console/bcomm/dircomm_auth.cpp:110
#, c-format
msgid "Director authorization problem at \"%s:%d\"\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:118
+#: src/qt-console/bcomm/dircomm_auth.cpp:117
#, c-format
msgid ""
"Authorization problem: Remote server at \"%s:%d\" did not advertise required "
"TLS support.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:126
+#: src/qt-console/bcomm/dircomm_auth.cpp:125
#, c-format
msgid ""
"Authorization problem with Director at \"%s:%d\": Remote server requires "
"TLS.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:137
+#: src/qt-console/bcomm/dircomm_auth.cpp:136
#, c-format
msgid "TLS negotiation failed with Director at \"%s:%d\"\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:149
+#: src/qt-console/bcomm/dircomm_auth.cpp:148
#, c-format
msgid ""
"Bad response to Hello command: ERR=%s\n"
"The Director at \"%s:%d\" is probably not running.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:158
+#: src/qt-console/bcomm/dircomm_auth.cpp:157
#, c-format
msgid "Director at \"%s:%d\" rejected Hello command\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:173
+#: src/qt-console/bcomm/dircomm_auth.cpp:172
#, c-format
msgid ""
"Authorization problem with Director at \"%s:%d\"\n"
@@ -238,16 +238,16 @@ msgid ""
"For help, please see "
msgstr ""
-#: src/qt-console/main.cpp:159
+#: src/qt-console/main.cpp:158
msgid "Cryptography library initialization failed.\n"
msgstr ""
-#: src/qt-console/main.cpp:163
+#: src/qt-console/main.cpp:162
#, c-format
msgid "Please correct configuration file: %s\n"
msgstr ""
-#: src/qt-console/main.cpp:187
+#: src/qt-console/main.cpp:186
#, c-format
msgid ""
"\n"
@@ -262,88 +262,88 @@ msgid ""
"\n"
msgstr ""
-#: src/qt-console/main.cpp:220 src/qt-console/main.cpp:250
+#: src/qt-console/main.cpp:219 src/qt-console/main.cpp:249
msgid "TLS required but not configured in Bacula.\n"
msgstr ""
-#: src/qt-console/main.cpp:228
+#: src/qt-console/main.cpp:227
#, c-format
msgid ""
"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
"Director \"%s\" in %s. At least one CA certificate store is required.\n"
msgstr ""
-#: src/qt-console/main.cpp:237
+#: src/qt-console/main.cpp:236
#, c-format
msgid ""
"No Director resource defined in %s\n"
"Without that I don't how to speak to the Director :-(\n"
msgstr ""
-#: src/qt-console/main.cpp:258
+#: src/qt-console/main.cpp:257
#, c-format
msgid ""
"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
"Console \"%s\" in %s.\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:79
+#: src/qt-console/tray-monitor/authenticate.cpp:78
msgid ""
"Director authorization problem.\n"
"Most likely the passwords do not agree.\n"
"For help, please see "
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:88
+#: src/qt-console/tray-monitor/authenticate.cpp:87
#, c-format
msgid "Bad response to Hello command: ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:95
+#: src/qt-console/tray-monitor/authenticate.cpp:94
msgid "Director rejected Hello command\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:123
+#: src/qt-console/tray-monitor/authenticate.cpp:122
#, c-format
msgid "Error sending Hello to Storage daemon. ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:129
+#: src/qt-console/tray-monitor/authenticate.cpp:128
msgid ""
"Director and Storage daemon passwords or names not the same.\n"
"For help, please see "
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:136
+#: src/qt-console/tray-monitor/authenticate.cpp:135
#, c-format
msgid "bdird<stored: bad response to Hello command: ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:143
+#: src/qt-console/tray-monitor/authenticate.cpp:142
msgid "Storage daemon rejected Hello command\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:169
+#: src/qt-console/tray-monitor/authenticate.cpp:168
#, c-format
msgid "Error sending Hello to File daemon. ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:175
+#: src/qt-console/tray-monitor/authenticate.cpp:174
msgid ""
"Director and File daemon passwords or names not the same.\n"
"For help, please see "
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:182
+#: src/qt-console/tray-monitor/authenticate.cpp:181
#, c-format
msgid "Bad response from File daemon to Hello command: ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:189
+#: src/qt-console/tray-monitor/authenticate.cpp:188
msgid "File daemon rejected Hello command\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:59
+#: src/qt-console/tray-monitor/tray-monitor.cpp:58
#, c-format
msgid ""
"\n"
@@ -358,14 +358,14 @@ msgid ""
"\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:210
+#: src/qt-console/tray-monitor/tray-monitor.cpp:209
#, c-format
msgid ""
"Error: %d Monitor resources defined in %s. You must define one and only one "
"Monitor resource.\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:242
+#: src/qt-console/tray-monitor/tray-monitor.cpp:241
#, c-format
msgid ""
"No Client, Storage or Director resource defined in %s\n"
@@ -373,7 +373,7 @@ msgid ""
"Daemon :-(\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:257
+#: src/qt-console/tray-monitor/tray-monitor.cpp:256
#, c-format
msgid ""
"Invalid refresh interval defined in %s\n"
@@ -381,106 +381,106 @@ msgid ""
"minutes (read value: %d).\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:325
+#: src/qt-console/tray-monitor/tray-monitor.cpp:324
#, c-format
msgid "Error, currentitem is not a Client or a Storage..\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:363
+#: src/qt-console/tray-monitor/tray-monitor.cpp:362
#, c-format
msgid "Connecting to Client %s:%d"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:368
+#: src/qt-console/tray-monitor/tray-monitor.cpp:367
msgid "File daemon"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:373
+#: src/qt-console/tray-monitor/tray-monitor.cpp:372
#, c-format
msgid "Connecting to Storage %s:%d"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:378
+#: src/qt-console/tray-monitor/tray-monitor.cpp:377
msgid "Storage daemon"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:382
-#: src/qt-console/tray-monitor/tray-monitor.cpp:412
+#: src/qt-console/tray-monitor/tray-monitor.cpp:381
+#: src/qt-console/tray-monitor/tray-monitor.cpp:411
#, c-format
msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:387
+#: src/qt-console/tray-monitor/tray-monitor.cpp:386
msgid "Cannot connect to daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:396
+#: src/qt-console/tray-monitor/tray-monitor.cpp:395
#, c-format
msgid "Authentication error : %s"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:403
+#: src/qt-console/tray-monitor/tray-monitor.cpp:402
msgid "Opened connection with Director daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:406
+#: src/qt-console/tray-monitor/tray-monitor.cpp:405
msgid "Opened connection with File daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:409
+#: src/qt-console/tray-monitor/tray-monitor.cpp:408
msgid "Opened connection with Storage daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:460
+#: src/qt-console/tray-monitor/tray-monitor.cpp:459
msgid "Error : BNET_HARDEOF or BNET_ERROR"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:469
+#: src/qt-console/tray-monitor/tray-monitor.cpp:468
msgid "Error : Connection closed."
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:160
+#: src/qt-console/tray-monitor/tray_conf.cpp:159
#, c-format
msgid "No %s resource defined\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:169
+#: src/qt-console/tray-monitor/tray_conf.cpp:168
#, c-format
msgid "Monitor: name=%s FDtimeout=%s SDtimeout=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:175
+#: src/qt-console/tray-monitor/tray_conf.cpp:174
#, c-format
msgid "Director: name=%s address=%s FDport=%d\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:179
+#: src/qt-console/tray-monitor/tray_conf.cpp:178
#, c-format
msgid "Client: name=%s address=%s FDport=%d\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:183
+#: src/qt-console/tray-monitor/tray_conf.cpp:182
#, c-format
msgid "Storage: name=%s address=%s SDport=%d\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:191
+#: src/qt-console/tray-monitor/tray_conf.cpp:190
#, c-format
msgid "Unknown resource type %d in dump_resource.\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:249
+#: src/qt-console/tray-monitor/tray_conf.cpp:248
#, c-format
msgid "Unknown resource type %d in free_resource.\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:286
+#: src/qt-console/tray-monitor/tray_conf.cpp:285
#, c-format
msgid "Too many items in %s resource\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:306
-#: src/qt-console/tray-monitor/tray_conf.cpp:344
+#: src/qt-console/tray-monitor/tray_conf.cpp:305
+#: src/qt-console/tray-monitor/tray_conf.cpp:343
#, c-format
msgid "Unknown resource type %d in save_resource.\n"
msgstr ""
diff --git a/po/de.po b/po/de.po
index 734d0d4..a80fd0e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,13 +1,13 @@
#
# German translations for Bacula package
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
# License: BSD 2-Clause; see file LICENSE-FOSS
#
msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: bacula-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2015-08-09 15:05+0200\n"
+"POT-Creation-Date: 2016-01-10 15:13+0100\n"
"PO-Revision-Date: 2007-06-25 20:38+0200\n"
"Last-Translator: Kern Sibbald <kern at sibbald.com>\n"
"Language-Team: \n"
@@ -27,180 +27,180 @@ msgstr ""
msgid "*None*"
msgstr ""
-#: src/lib/status.h:78
+#: src/lib/status.h:77
msgid ""
"\n"
"Terminated Jobs:\n"
msgstr ""
-#: src/lib/status.h:85
+#: src/lib/status.h:84
msgid " JobId Level Files Bytes Status Finished Name \n"
msgstr ""
-#: src/lib/status.h:87
+#: src/lib/status.h:86
msgid "===================================================================\n"
msgstr ""
-#: src/lib/status.h:107
+#: src/lib/status.h:106
msgid "Created"
msgstr ""
-#: src/lib/status.h:111
+#: src/lib/status.h:110
msgid "Error"
msgstr ""
-#: src/lib/status.h:114
+#: src/lib/status.h:113
msgid "Diffs"
msgstr ""
-#: src/lib/status.h:117
+#: src/lib/status.h:116
msgid "Cancel"
msgstr ""
-#: src/lib/status.h:120
+#: src/lib/status.h:119
msgid "OK"
msgstr ""
-#: src/lib/status.h:123
+#: src/lib/status.h:122
#, fuzzy
msgid "OK -- with warnings"
msgstr "%s OK -- mit Warnungen"
-#: src/lib/status.h:126
+#: src/lib/status.h:125
msgid "Incomplete"
msgstr ""
-#: src/lib/status.h:129
+#: src/lib/status.h:128
msgid "Other"
msgstr ""
-#: src/lib/status.h:141
+#: src/lib/status.h:140
#, c-format
msgid "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n"
msgstr ""
-#: src/lib/status.h:149
+#: src/lib/status.h:148
#, c-format
msgid "%6d %-6s %8s %10s %-7s %-8s %s\n"
msgstr ""
-#: src/lib/status.h:178 src/lib/status.h:189 src/lib/status.h:203
-#: src/lib/status.h:207 src/lib/status.h:211
+#: src/lib/status.h:177 src/lib/status.h:188 src/lib/status.h:202
+#: src/lib/status.h:206 src/lib/status.h:210
msgid "Bacula "
msgstr "Bacula "
-#: src/qt-console/bat_conf.cpp:133
+#: src/qt-console/bat_conf.cpp:132
#, c-format
msgid "No record for %d %s\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:142
+#: src/qt-console/bat_conf.cpp:141
#, c-format
msgid "Director: name=%s address=%s DIRport=%d\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:146
+#: src/qt-console/bat_conf.cpp:145
#, c-format
msgid "Console: name=%s\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:149
-#: src/qt-console/tray-monitor/tray_conf.cpp:187
+#: src/qt-console/bat_conf.cpp:148
+#: src/qt-console/tray-monitor/tray_conf.cpp:186
#, c-format
msgid "ConsoleFont: name=%s font face=%s\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:153 src/qt-console/bat_conf.cpp:234
-#: src/qt-console/bat_conf.cpp:284 src/qt-console/bat_conf.cpp:314
+#: src/qt-console/bat_conf.cpp:152 src/qt-console/bat_conf.cpp:233
+#: src/qt-console/bat_conf.cpp:283 src/qt-console/bat_conf.cpp:313
#, c-format
msgid "Unknown resource type %d\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:262
-#: src/qt-console/tray-monitor/tray_conf.cpp:280
+#: src/qt-console/bat_conf.cpp:261
+#: src/qt-console/tray-monitor/tray_conf.cpp:279
#, c-format
msgid "%s item is required in %s resource, but not found.\n"
msgstr "%s item wird in %s resource ben�tigt, wurde aber nicht gefunden.\n"
-#: src/qt-console/bat_conf.cpp:331
-#: src/qt-console/tray-monitor/tray_conf.cpp:364
+#: src/qt-console/bat_conf.cpp:330
+#: src/qt-console/tray-monitor/tray_conf.cpp:363
#, c-format
msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
msgstr ""
"Der Versuch der Definition einer zweiten %s resource mit dem Namen \"%s\" "
"ist nicht erlaubt.\n"
-#: src/qt-console/bcomm/dircomm.cpp:89
+#: src/qt-console/bcomm/dircomm.cpp:88
#, c-format
msgid "Already connected\"%s\".\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:100
-#: src/qt-console/tray-monitor/tray-monitor.cpp:353
+#: src/qt-console/bcomm/dircomm.cpp:99
+#: src/qt-console/tray-monitor/tray-monitor.cpp:352
#, c-format
msgid "Connecting to Director %s:%d"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:102
+#: src/qt-console/bcomm/dircomm.cpp:101
#, c-format
msgid ""
"Connecting to Director %s:%d\n"
"\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:154
+#: src/qt-console/bcomm/dircomm.cpp:153
#, c-format
msgid "Failed to initialize TLS context for Console \"%s\".\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:177
+#: src/qt-console/bcomm/dircomm.cpp:176
#, c-format
msgid "Failed to initialize TLS context for Director \"%s\".\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:199
-#: src/qt-console/tray-monitor/tray-monitor.cpp:358
+#: src/qt-console/bcomm/dircomm.cpp:198
+#: src/qt-console/tray-monitor/tray-monitor.cpp:357
msgid "Director daemon"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:237
+#: src/qt-console/bcomm/dircomm.cpp:236
msgid "Initializing ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:253 src/qt-console/console/console.cpp:134
+#: src/qt-console/bcomm/dircomm.cpp:252 src/qt-console/console/console.cpp:133
msgid "Connected"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:377
+#: src/qt-console/bcomm/dircomm.cpp:376
msgid "Command completed ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:384 src/qt-console/console/console.cpp:371
+#: src/qt-console/bcomm/dircomm.cpp:383 src/qt-console/console/console.cpp:370
msgid "Processing command ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:391
+#: src/qt-console/bcomm/dircomm.cpp:390
msgid "At main prompt waiting for input ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:398 src/qt-console/bcomm/dircomm.cpp:408
+#: src/qt-console/bcomm/dircomm.cpp:397 src/qt-console/bcomm/dircomm.cpp:407
msgid "At prompt waiting for input ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:416
+#: src/qt-console/bcomm/dircomm.cpp:415
msgid "Command failed."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:488
+#: src/qt-console/bcomm/dircomm.cpp:487
msgid "Director disconnected."
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:111
+#: src/qt-console/bcomm/dircomm_auth.cpp:110
#, fuzzy, c-format
msgid "Director authorization problem at \"%s:%d\"\n"
msgstr "Authorisationsproblem: FD an \"%s:%d\" erfordert TLS.\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:118
+#: src/qt-console/bcomm/dircomm_auth.cpp:117
#, fuzzy, c-format
msgid ""
"Authorization problem: Remote server at \"%s:%d\" did not advertise required "
@@ -209,31 +209,31 @@ msgstr ""
"Authorisationsproblem: Entfernter Server hat ben�tigte TLS Unterst�tzung "
"nicht angeboten.\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:126
+#: src/qt-console/bcomm/dircomm_auth.cpp:125
#, fuzzy, c-format
msgid ""
"Authorization problem with Director at \"%s:%d\": Remote server requires "
"TLS.\n"
msgstr "Authorisationsproblem: Enfernter Server erfordert TLS.\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:137
+#: src/qt-console/bcomm/dircomm_auth.cpp:136
#, fuzzy, c-format
msgid "TLS negotiation failed with Director at \"%s:%d\"\n"
msgstr "TLS Aushandlung fehlgeschlagen mit SD an \"%s:%d\"\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:149
+#: src/qt-console/bcomm/dircomm_auth.cpp:148
#, c-format
msgid ""
"Bad response to Hello command: ERR=%s\n"
"The Director at \"%s:%d\" is probably not running.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:158
+#: src/qt-console/bcomm/dircomm_auth.cpp:157
#, fuzzy, c-format
msgid "Director at \"%s:%d\" rejected Hello command\n"
msgstr "File daemon auf \"%s:%d\" hat Hello Kommando abgelehnt\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:173
+#: src/qt-console/bcomm/dircomm_auth.cpp:172
#, fuzzy, c-format
msgid ""
"Authorization problem with Director at \"%s:%d\"\n"
@@ -249,16 +249,16 @@ msgstr ""
"F�r Hilfe bitte unter http://www.bacula.org/rel-manual/faq."
"html#AuthorizationErrors nachsehen.\n"
-#: src/qt-console/main.cpp:159
+#: src/qt-console/main.cpp:158
msgid "Cryptography library initialization failed.\n"
msgstr "Initialisierung der Verschl�sselungsbibliothek fehlgeschlagen.\n"
-#: src/qt-console/main.cpp:163
+#: src/qt-console/main.cpp:162
#, c-format
msgid "Please correct configuration file: %s\n"
msgstr "Bitte die Konfigurationsdatei korrigieren: %s\n"
-#: src/qt-console/main.cpp:187
+#: src/qt-console/main.cpp:186
#, fuzzy, c-format
msgid ""
"\n"
@@ -288,32 +288,32 @@ msgstr ""
" -? diese Meldung ausgeben.\n"
"\n"
-#: src/qt-console/main.cpp:220 src/qt-console/main.cpp:250
+#: src/qt-console/main.cpp:219 src/qt-console/main.cpp:249
msgid "TLS required but not configured in Bacula.\n"
msgstr "TLS ben�tigt aber nicht konfiguriert in Bacula.\n"
-#: src/qt-console/main.cpp:228
+#: src/qt-console/main.cpp:227
#, c-format
msgid ""
"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
"Director \"%s\" in %s. At least one CA certificate store is required.\n"
msgstr ""
-#: src/qt-console/main.cpp:237
+#: src/qt-console/main.cpp:236
#, c-format
msgid ""
"No Director resource defined in %s\n"
"Without that I don't how to speak to the Director :-(\n"
msgstr ""
-#: src/qt-console/main.cpp:258
+#: src/qt-console/main.cpp:257
#, c-format
msgid ""
"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
"Console \"%s\" in %s.\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:79
+#: src/qt-console/tray-monitor/authenticate.cpp:78
#, fuzzy
msgid ""
"Director authorization problem.\n"
@@ -327,58 +327,58 @@ msgstr ""
"F�r Hilfe bitte unter http://www.bacula.org/rel-manual/faq."
"html#AuthorizationErrors nachsehen.\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:88
+#: src/qt-console/tray-monitor/authenticate.cpp:87
#, c-format
msgid "Bad response to Hello command: ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:95
+#: src/qt-console/tray-monitor/authenticate.cpp:94
msgid "Director rejected Hello command\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:123
+#: src/qt-console/tray-monitor/authenticate.cpp:122
#, c-format
msgid "Error sending Hello to Storage daemon. ERR=%s\n"
msgstr "Fehler beim senden von \"Hello\" an Storage daemon. ERR=%s\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:129
+#: src/qt-console/tray-monitor/authenticate.cpp:128
#, fuzzy
msgid ""
"Director and Storage daemon passwords or names not the same.\n"
"For help, please see "
msgstr "Director und Storage daemon Passworte or Namen nicht gleich.\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:136
+#: src/qt-console/tray-monitor/authenticate.cpp:135
#, c-format
msgid "bdird<stored: bad response to Hello command: ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:143
+#: src/qt-console/tray-monitor/authenticate.cpp:142
msgid "Storage daemon rejected Hello command\n"
msgstr "Storage daemon hat Hello Kommando abgewiesen.\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:169
+#: src/qt-console/tray-monitor/authenticate.cpp:168
#, c-format
msgid "Error sending Hello to File daemon. ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:175
+#: src/qt-console/tray-monitor/authenticate.cpp:174
#, fuzzy
msgid ""
"Director and File daemon passwords or names not the same.\n"
"For help, please see "
msgstr "Director und File daemon Passworte oder Namen sind nicht gleich.\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:182
+#: src/qt-console/tray-monitor/authenticate.cpp:181
#, c-format
msgid "Bad response from File daemon to Hello command: ERR=%s\n"
msgstr "Fehlerhafte Antwort von File daemon auf Hello Kommando: ERR=%s\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:189
+#: src/qt-console/tray-monitor/authenticate.cpp:188
msgid "File daemon rejected Hello command\n"
msgstr "File daemon hat Hello Kommando abgelehnt\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:59
+#: src/qt-console/tray-monitor/tray-monitor.cpp:58
#, fuzzy, c-format
msgid ""
"\n"
@@ -408,14 +408,14 @@ msgstr ""
" -? diese Meldung ausgeben.\n"
"\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:210
+#: src/qt-console/tray-monitor/tray-monitor.cpp:209
#, c-format
msgid ""
"Error: %d Monitor resources defined in %s. You must define one and only one "
"Monitor resource.\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:242
+#: src/qt-console/tray-monitor/tray-monitor.cpp:241
#, fuzzy, c-format
msgid ""
"No Client, Storage or Director resource defined in %s\n"
@@ -425,7 +425,7 @@ msgstr ""
"Keine Director resource definiert in %s\n"
"Ohne dies weiss ich nicht wer ich bin :-(\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:257
+#: src/qt-console/tray-monitor/tray-monitor.cpp:256
#, c-format
msgid ""
"Invalid refresh interval defined in %s\n"
@@ -433,106 +433,106 @@ msgid ""
"minutes (read value: %d).\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:325
+#: src/qt-console/tray-monitor/tray-monitor.cpp:324
#, c-format
msgid "Error, currentitem is not a Client or a Storage..\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:363
+#: src/qt-console/tray-monitor/tray-monitor.cpp:362
#, c-format
msgid "Connecting to Client %s:%d"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:368
+#: src/qt-console/tray-monitor/tray-monitor.cpp:367
msgid "File daemon"
msgstr "File daemon"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:373
+#: src/qt-console/tray-monitor/tray-monitor.cpp:372
#, fuzzy, c-format
msgid "Connecting to Storage %s:%d"
msgstr "Storage daemon"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:378
+#: src/qt-console/tray-monitor/tray-monitor.cpp:377
msgid "Storage daemon"
msgstr "Storage daemon"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:382
-#: src/qt-console/tray-monitor/tray-monitor.cpp:412
+#: src/qt-console/tray-monitor/tray-monitor.cpp:381
+#: src/qt-console/tray-monitor/tray-monitor.cpp:411
#, c-format
msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:387
+#: src/qt-console/tray-monitor/tray-monitor.cpp:386
msgid "Cannot connect to daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:396
+#: src/qt-console/tray-monitor/tray-monitor.cpp:395
#, c-format
msgid "Authentication error : %s"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:403
+#: src/qt-console/tray-monitor/tray-monitor.cpp:402
msgid "Opened connection with Director daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:406
+#: src/qt-console/tray-monitor/tray-monitor.cpp:405
msgid "Opened connection with File daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:409
+#: src/qt-console/tray-monitor/tray-monitor.cpp:408
msgid "Opened connection with Storage daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:460
+#: src/qt-console/tray-monitor/tray-monitor.cpp:459
msgid "Error : BNET_HARDEOF or BNET_ERROR"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:469
+#: src/qt-console/tray-monitor/tray-monitor.cpp:468
msgid "Error : Connection closed."
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:160
+#: src/qt-console/tray-monitor/tray_conf.cpp:159
#, c-format
msgid "No %s resource defined\n"
msgstr "Keine %s resource definiert\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:169
+#: src/qt-console/tray-monitor/tray_conf.cpp:168
#, c-format
msgid "Monitor: name=%s FDtimeout=%s SDtimeout=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:175
+#: src/qt-console/tray-monitor/tray_conf.cpp:174
#, c-format
msgid "Director: name=%s address=%s FDport=%d\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:179
+#: src/qt-console/tray-monitor/tray_conf.cpp:178
#, c-format
msgid "Client: name=%s address=%s FDport=%d\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:183
+#: src/qt-console/tray-monitor/tray_conf.cpp:182
#, c-format
msgid "Storage: name=%s address=%s SDport=%d\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:191
+#: src/qt-console/tray-monitor/tray_conf.cpp:190
#, c-format
msgid "Unknown resource type %d in dump_resource.\n"
msgstr "Unbekannter resource type %d in dump_resource.\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:249
+#: src/qt-console/tray-monitor/tray_conf.cpp:248
#, c-format
msgid "Unknown resource type %d in free_resource.\n"
msgstr "Unbekannter resource type %d in free_resource.\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:286
+#: src/qt-console/tray-monitor/tray_conf.cpp:285
#, c-format
msgid "Too many items in %s resource\n"
msgstr "zu viele items in %s resource\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:306
-#: src/qt-console/tray-monitor/tray_conf.cpp:344
+#: src/qt-console/tray-monitor/tray_conf.cpp:305
+#: src/qt-console/tray-monitor/tray_conf.cpp:343
#, c-format
msgid "Unknown resource type %d in save_resource.\n"
msgstr "Unbekannter resource type %d in save_resource.\n"
diff --git a/po/es.po b/po/es.po
index 24dae7f..d8a28ac 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,13 +1,13 @@
# Spanish translations for branch package
# Traducciones al español para el paquete branch.
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
# License: BSD 2-Clause; see file LICENSE-FOSS
#
msgid ""
msgstr ""
"Project-Id-Version: Bacula 3.0.2\n"
"Report-Msgid-Bugs-To: bacula-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2015-08-09 15:05+0200\n"
+"POT-Creation-Date: 2016-01-10 15:13+0100\n"
"PO-Revision-Date: 2009-12-01 16:04-0300\n"
"Last-Translator: Victor Hugo dos Santos <listas.vhs at gmail.com>\n"
"Language-Team: Bacula Spanish Team <bacula-users-es at lists.sourceforge.net>\n"
@@ -29,7 +29,7 @@ msgstr "Fallo ASSERT: %s\n"
msgid "*None*"
msgstr "*Ninguno*"
-#: src/lib/status.h:78
+#: src/lib/status.h:77
msgid ""
"\n"
"Terminated Jobs:\n"
@@ -37,113 +37,113 @@ msgstr ""
"\n"
"Jobs No Terminados:\n"
-#: src/lib/status.h:85
+#: src/lib/status.h:84
msgid " JobId Level Files Bytes Status Finished Name \n"
msgstr "JobId Nivel Archivos Bytes Estado Finalizado Nombre \n"
-#: src/lib/status.h:87
+#: src/lib/status.h:86
msgid "===================================================================\n"
msgstr "===================================================================\n"
-#: src/lib/status.h:107
+#: src/lib/status.h:106
msgid "Created"
msgstr "Creado"
-#: src/lib/status.h:111
+#: src/lib/status.h:110
msgid "Error"
msgstr "Error"
-#: src/lib/status.h:114
+#: src/lib/status.h:113
msgid "Diffs"
msgstr "Diferencias"
-#: src/lib/status.h:117
+#: src/lib/status.h:116
msgid "Cancel"
msgstr "Cancelar"
-#: src/lib/status.h:120
+#: src/lib/status.h:119
msgid "OK"
msgstr "OK"
-#: src/lib/status.h:123
+#: src/lib/status.h:122
msgid "OK -- with warnings"
msgstr "OK - con advertencias"
-#: src/lib/status.h:126
+#: src/lib/status.h:125
msgid "Incomplete"
msgstr ""
-#: src/lib/status.h:129
+#: src/lib/status.h:128
msgid "Other"
msgstr "Otros"
-#: src/lib/status.h:141
+#: src/lib/status.h:140
#, c-format
msgid "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n"
msgstr "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n"
-#: src/lib/status.h:149
+#: src/lib/status.h:148
#, c-format
msgid "%6d %-6s %8s %10s %-7s %-8s %s\n"
msgstr "%6d %-6s %8s %10s %-7s %-8s %s\n"
-#: src/lib/status.h:178 src/lib/status.h:189 src/lib/status.h:203
-#: src/lib/status.h:207 src/lib/status.h:211
+#: src/lib/status.h:177 src/lib/status.h:188 src/lib/status.h:202
+#: src/lib/status.h:206 src/lib/status.h:210
msgid "Bacula "
msgstr "Bacula"
-#: src/qt-console/bat_conf.cpp:133
+#: src/qt-console/bat_conf.cpp:132
#, c-format
msgid "No record for %d %s\n"
msgstr "Ningún registro para %d %s\n"
-#: src/qt-console/bat_conf.cpp:142
+#: src/qt-console/bat_conf.cpp:141
#, c-format
msgid "Director: name=%s address=%s DIRport=%d\n"
msgstr "Director: nombre=%s dirección=%s DIRport=%d\n"
-#: src/qt-console/bat_conf.cpp:146
+#: src/qt-console/bat_conf.cpp:145
#, c-format
msgid "Console: name=%s\n"
msgstr "Console: nombre=%s\n"
-#: src/qt-console/bat_conf.cpp:149
-#: src/qt-console/tray-monitor/tray_conf.cpp:187
+#: src/qt-console/bat_conf.cpp:148
+#: src/qt-console/tray-monitor/tray_conf.cpp:186
#, c-format
msgid "ConsoleFont: name=%s font face=%s\n"
msgstr "ConsoleFont: nombre=%s font face=%s\n"
-#: src/qt-console/bat_conf.cpp:153 src/qt-console/bat_conf.cpp:234
-#: src/qt-console/bat_conf.cpp:284 src/qt-console/bat_conf.cpp:314
+#: src/qt-console/bat_conf.cpp:152 src/qt-console/bat_conf.cpp:233
+#: src/qt-console/bat_conf.cpp:283 src/qt-console/bat_conf.cpp:313
#, c-format
msgid "Unknown resource type %d\n"
msgstr "Tipo de recurso desconocido %d\n"
-#: src/qt-console/bat_conf.cpp:262
-#: src/qt-console/tray-monitor/tray_conf.cpp:280
+#: src/qt-console/bat_conf.cpp:261
+#: src/qt-console/tray-monitor/tray_conf.cpp:279
#, c-format
msgid "%s item is required in %s resource, but not found.\n"
msgstr "Ítem %s es necesario en recurso %s, pero no se encuentra.\n"
-#: src/qt-console/bat_conf.cpp:331
-#: src/qt-console/tray-monitor/tray_conf.cpp:364
+#: src/qt-console/bat_conf.cpp:330
+#: src/qt-console/tray-monitor/tray_conf.cpp:363
#, c-format
msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
msgstr ""
"Segundo intento de definir recurso %s llamado \"%s\" no está permitido.\n"
-#: src/qt-console/bcomm/dircomm.cpp:89
+#: src/qt-console/bcomm/dircomm.cpp:88
#, c-format
msgid "Already connected\"%s\".\n"
msgstr "Ya conectado\"%s\".\n"
-#: src/qt-console/bcomm/dircomm.cpp:100
-#: src/qt-console/tray-monitor/tray-monitor.cpp:353
+#: src/qt-console/bcomm/dircomm.cpp:99
+#: src/qt-console/tray-monitor/tray-monitor.cpp:352
#, c-format
msgid "Connecting to Director %s:%d"
msgstr "Conectando con Director %s:%d"
-#: src/qt-console/bcomm/dircomm.cpp:102
+#: src/qt-console/bcomm/dircomm.cpp:101
#, c-format
msgid ""
"Connecting to Director %s:%d\n"
@@ -152,59 +152,59 @@ msgstr ""
"Conectando con Director %s:%d\n"
"\n"
-#: src/qt-console/bcomm/dircomm.cpp:154
+#: src/qt-console/bcomm/dircomm.cpp:153
#, c-format
msgid "Failed to initialize TLS context for Console \"%s\".\n"
msgstr "Fallo al inicializar el contexto TLS para la consola \"%s\".\n"
-#: src/qt-console/bcomm/dircomm.cpp:177
+#: src/qt-console/bcomm/dircomm.cpp:176
#, c-format
msgid "Failed to initialize TLS context for Director \"%s\".\n"
msgstr "Fallo al inicializar el contexto TLS para el Director \"%s\".\n"
-#: src/qt-console/bcomm/dircomm.cpp:199
-#: src/qt-console/tray-monitor/tray-monitor.cpp:358
+#: src/qt-console/bcomm/dircomm.cpp:198
+#: src/qt-console/tray-monitor/tray-monitor.cpp:357
msgid "Director daemon"
msgstr "Servicio Director"
-#: src/qt-console/bcomm/dircomm.cpp:237
+#: src/qt-console/bcomm/dircomm.cpp:236
msgid "Initializing ..."
msgstr "Inicializando ..."
-#: src/qt-console/bcomm/dircomm.cpp:253 src/qt-console/console/console.cpp:134
+#: src/qt-console/bcomm/dircomm.cpp:252 src/qt-console/console/console.cpp:133
msgid "Connected"
msgstr "Conectado"
-#: src/qt-console/bcomm/dircomm.cpp:377
+#: src/qt-console/bcomm/dircomm.cpp:376
msgid "Command completed ..."
msgstr "Comando completado ..."
-#: src/qt-console/bcomm/dircomm.cpp:384 src/qt-console/console/console.cpp:371
+#: src/qt-console/bcomm/dircomm.cpp:383 src/qt-console/console/console.cpp:370
msgid "Processing command ..."
msgstr "Procesando comando ..."
-#: src/qt-console/bcomm/dircomm.cpp:391
+#: src/qt-console/bcomm/dircomm.cpp:390
msgid "At main prompt waiting for input ..."
msgstr "En prompt principal esperando por una entrada..."
-#: src/qt-console/bcomm/dircomm.cpp:398 src/qt-console/bcomm/dircomm.cpp:408
+#: src/qt-console/bcomm/dircomm.cpp:397 src/qt-console/bcomm/dircomm.cpp:407
msgid "At prompt waiting for input ..."
msgstr "En prompt esperando por una entrada..."
-#: src/qt-console/bcomm/dircomm.cpp:416
+#: src/qt-console/bcomm/dircomm.cpp:415
msgid "Command failed."
msgstr "Comando fallido."
-#: src/qt-console/bcomm/dircomm.cpp:488
+#: src/qt-console/bcomm/dircomm.cpp:487
msgid "Director disconnected."
msgstr "Director desconectado."
-#: src/qt-console/bcomm/dircomm_auth.cpp:111
+#: src/qt-console/bcomm/dircomm_auth.cpp:110
#, c-format
msgid "Director authorization problem at \"%s:%d\"\n"
msgstr "Problema de autorización de Director en \"%s:%d\"\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:118
+#: src/qt-console/bcomm/dircomm_auth.cpp:117
#, c-format
msgid ""
"Authorization problem: Remote server at \"%s:%d\" did not advertise required "
@@ -213,7 +213,7 @@ msgstr ""
"Problema de autorización: El servidor remoto en \"%s:%d\" no anuncio soporte "
"TLS requiere.\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:126
+#: src/qt-console/bcomm/dircomm_auth.cpp:125
#, c-format
msgid ""
"Authorization problem with Director at \"%s:%d\": Remote server requires "
@@ -222,12 +222,12 @@ msgstr ""
"Problema de autorización con el Director en \"%s:%d\": El servidor remoto "
"requiere TLS.\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:137
+#: src/qt-console/bcomm/dircomm_auth.cpp:136
#, c-format
msgid "TLS negotiation failed with Director at \"%s:%d\"\n"
msgstr "Fallo negociación TLS no con el Director en \"%s:%d\"\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:149
+#: src/qt-console/bcomm/dircomm_auth.cpp:148
#, c-format
msgid ""
"Bad response to Hello command: ERR=%s\n"
@@ -236,12 +236,12 @@ msgstr ""
"Mala respuesta al comando Hello: ERR=%s\n"
"El director en \"%s:%d\" probablemente no esta corriendo.\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:158
+#: src/qt-console/bcomm/dircomm_auth.cpp:157
#, c-format
msgid "Director at \"%s:%d\" rejected Hello command\n"
msgstr "Director en \"%s:%d\" rechazó comando Hello\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:173
+#: src/qt-console/bcomm/dircomm_auth.cpp:172
#, fuzzy, c-format
msgid ""
"Authorization problem with Director at \"%s:%d\"\n"
@@ -257,16 +257,16 @@ msgstr ""
" Por favor vea http://www.bacula.org/en/rel-manual/"
"Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 para ayuda.\n"
-#: src/qt-console/main.cpp:159
+#: src/qt-console/main.cpp:158
msgid "Cryptography library initialization failed.\n"
msgstr "Inicialización de la librería de criptografía ha fallado.\n"
-#: src/qt-console/main.cpp:163
+#: src/qt-console/main.cpp:162
#, c-format
msgid "Please correct configuration file: %s\n"
msgstr "Por favor, corrija el archivo de configuración: %s\n"
-#: src/qt-console/main.cpp:187
+#: src/qt-console/main.cpp:186
#, fuzzy, c-format
msgid ""
"\n"
@@ -292,11 +292,11 @@ msgstr ""
" -? imprimir este mensaje.\n"
"\n"
-#: src/qt-console/main.cpp:220 src/qt-console/main.cpp:250
+#: src/qt-console/main.cpp:219 src/qt-console/main.cpp:249
msgid "TLS required but not configured in Bacula.\n"
msgstr "Se requiere TLS pero no está configurado en Bacula.\n"
-#: src/qt-console/main.cpp:228
+#: src/qt-console/main.cpp:227
#, c-format
msgid ""
"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -306,7 +306,7 @@ msgstr ""
"definidos para Director \"%s\" en %s. Por lo menos un almacén de "
"Certificados CA es necesario.\n"
-#: src/qt-console/main.cpp:237
+#: src/qt-console/main.cpp:236
#, c-format
msgid ""
"No Director resource defined in %s\n"
@@ -315,7 +315,7 @@ msgstr ""
"Recurso Director no definido en %s\n"
"Sin eso no sé cómo hablar con el Director :-(\n"
-#: src/qt-console/main.cpp:258
+#: src/qt-console/main.cpp:257
#, c-format
msgid ""
"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -324,7 +324,7 @@ msgstr ""
"Ni \"Certificado TLS CA\" o \"Directorio de Certificado TLS CA\" están "
"definidos para Console \"%s\" en %s.\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:79
+#: src/qt-console/tray-monitor/authenticate.cpp:78
#, fuzzy
msgid ""
"Director authorization problem.\n"
@@ -336,58 +336,58 @@ msgstr ""
"Por favor vea http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi."
"html#SECTION003760000000000000000 para ayuda.\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:88
+#: src/qt-console/tray-monitor/authenticate.cpp:87
#, c-format
msgid "Bad response to Hello command: ERR=%s\n"
msgstr "mala respuesta al comando Hello: ERR=%s\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:95
+#: src/qt-console/tray-monitor/authenticate.cpp:94
msgid "Director rejected Hello command\n"
msgstr "Director rechazo comando Hello\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:123
+#: src/qt-console/tray-monitor/authenticate.cpp:122
#, c-format
msgid "Error sending Hello to Storage daemon. ERR=%s\n"
msgstr "Error enviando Hello al servicio de Almacenamiento. ERR=%s\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:129
+#: src/qt-console/tray-monitor/authenticate.cpp:128
#, fuzzy
msgid ""
"Director and Storage daemon passwords or names not the same.\n"
"For help, please see "
msgstr "Nombres o contraseñas en el Director o Storage no son las mismas.\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:136
+#: src/qt-console/tray-monitor/authenticate.cpp:135
#, c-format
msgid "bdird<stored: bad response to Hello command: ERR=%s\n"
msgstr "bdird<stored:mala respuesta al comando Hello: ERR=%s\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:143
+#: src/qt-console/tray-monitor/authenticate.cpp:142
msgid "Storage daemon rejected Hello command\n"
msgstr "Storage servicio rechazo el comando Hello\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:169
+#: src/qt-console/tray-monitor/authenticate.cpp:168
#, c-format
msgid "Error sending Hello to File daemon. ERR=%s\n"
msgstr "Error al enviar Hello para el demonio File. ERR=%s\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:175
+#: src/qt-console/tray-monitor/authenticate.cpp:174
#, fuzzy
msgid ""
"Director and File daemon passwords or names not the same.\n"
"For help, please see "
msgstr "Contraseñas del demonio Director y File no son los mismos.\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:182
+#: src/qt-console/tray-monitor/authenticate.cpp:181
#, c-format
msgid "Bad response from File daemon to Hello command: ERR=%s\n"
msgstr "Mala respuesta desde el demonio File para el comando Hello: ERR=%s\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:189
+#: src/qt-console/tray-monitor/authenticate.cpp:188
msgid "File daemon rejected Hello command\n"
msgstr "El demonio File rechazó el comando Hello\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:59
+#: src/qt-console/tray-monitor/tray-monitor.cpp:58
#, fuzzy, c-format
msgid ""
"\n"
@@ -413,7 +413,7 @@ msgstr ""
" -? imprimir este mensaje.\n"
"\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:210
+#: src/qt-console/tray-monitor/tray-monitor.cpp:209
#, c-format
msgid ""
"Error: %d Monitor resources defined in %s. You must define one and only one "
@@ -422,7 +422,7 @@ msgstr ""
"Error: %d Monitor de recursos definidos en %s. Usted debe definir un único "
"monitor de recursos.\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:242
+#: src/qt-console/tray-monitor/tray-monitor.cpp:241
#, c-format
msgid ""
"No Client, Storage or Director resource defined in %s\n"
@@ -433,7 +433,7 @@ msgstr ""
"Sin esto, Yo no se como obtener el estado de los demonios File, Storage o "
"Director :-(\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:257
+#: src/qt-console/tray-monitor/tray-monitor.cpp:256
#, c-format
msgid ""
"Invalid refresh interval defined in %s\n"
@@ -444,106 +444,106 @@ msgstr ""
"Este valor debe ser mayor o igual a 1 segundo y menor o igual a 10 minutos "
"(leer el valor:% d).\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:325
+#: src/qt-console/tray-monitor/tray-monitor.cpp:324
#, c-format
msgid "Error, currentitem is not a Client or a Storage..\n"
msgstr "Error, CurrentItem no es un Cliente o un Storage ...\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:363
+#: src/qt-console/tray-monitor/tray-monitor.cpp:362
#, c-format
msgid "Connecting to Client %s:%d"
msgstr "Conectando con Cliente %s:%d"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:368
+#: src/qt-console/tray-monitor/tray-monitor.cpp:367
msgid "File daemon"
msgstr "demonio File"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:373
+#: src/qt-console/tray-monitor/tray-monitor.cpp:372
#, c-format
msgid "Connecting to Storage %s:%d"
msgstr "Conectando con Storage %s:%d"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:378
+#: src/qt-console/tray-monitor/tray-monitor.cpp:377
msgid "Storage daemon"
msgstr "Demonio Storage"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:382
-#: src/qt-console/tray-monitor/tray-monitor.cpp:412
+#: src/qt-console/tray-monitor/tray-monitor.cpp:381
+#: src/qt-console/tray-monitor/tray-monitor.cpp:411
#, c-format
msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
msgstr "Error, currentitem no es un cliente, un Storage o un Director..\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:387
+#: src/qt-console/tray-monitor/tray-monitor.cpp:386
msgid "Cannot connect to daemon."
msgstr "No se puede conectar al demonio"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:396
+#: src/qt-console/tray-monitor/tray-monitor.cpp:395
#, c-format
msgid "Authentication error : %s"
msgstr "Error de autenticación : %s"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:403
+#: src/qt-console/tray-monitor/tray-monitor.cpp:402
msgid "Opened connection with Director daemon."
msgstr "Conexión abierta con demonio Director."
-#: src/qt-console/tray-monitor/tray-monitor.cpp:406
+#: src/qt-console/tray-monitor/tray-monitor.cpp:405
msgid "Opened connection with File daemon."
msgstr "Conexión abierta con demonio File."
-#: src/qt-console/tray-monitor/tray-monitor.cpp:409
+#: src/qt-console/tray-monitor/tray-monitor.cpp:408
msgid "Opened connection with Storage daemon."
msgstr "Conexión abierta con demonio Storage."
-#: src/qt-console/tray-monitor/tray-monitor.cpp:460
+#: src/qt-console/tray-monitor/tray-monitor.cpp:459
msgid "Error : BNET_HARDEOF or BNET_ERROR"
msgstr "Error: BNET_HARDEOF o BNET_ERROR"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:469
+#: src/qt-console/tray-monitor/tray-monitor.cpp:468
msgid "Error : Connection closed."
msgstr "Error : Conexión cerrada."
-#: src/qt-console/tray-monitor/tray_conf.cpp:160
+#: src/qt-console/tray-monitor/tray_conf.cpp:159
#, c-format
msgid "No %s resource defined\n"
msgstr "Recurso %s no definido\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:169
+#: src/qt-console/tray-monitor/tray_conf.cpp:168
#, c-format
msgid "Monitor: name=%s FDtimeout=%s SDtimeout=%s\n"
msgstr "Monitor: nombre=%s FDtimeout=%s SDtimeout=%s\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:175
+#: src/qt-console/tray-monitor/tray_conf.cpp:174
#, c-format
msgid "Director: name=%s address=%s FDport=%d\n"
msgstr "Director: nombre=%s dirección=%s FDport=%d\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:179
+#: src/qt-console/tray-monitor/tray_conf.cpp:178
#, c-format
msgid "Client: name=%s address=%s FDport=%d\n"
msgstr "Cliente: nombre=%s dirección=%s FDport=%d\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:183
+#: src/qt-console/tray-monitor/tray_conf.cpp:182
#, c-format
msgid "Storage: name=%s address=%s SDport=%d\n"
msgstr "Storage: nombre=%s dirección=%s SDport=%d\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:191
+#: src/qt-console/tray-monitor/tray_conf.cpp:190
#, c-format
msgid "Unknown resource type %d in dump_resource.\n"
msgstr "Tipo de recurso desconocido %d en dump_resource.\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:249
+#: src/qt-console/tray-monitor/tray_conf.cpp:248
#, c-format
msgid "Unknown resource type %d in free_resource.\n"
msgstr "Tipo de recurso desconocido %d en free_resource.\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:286
+#: src/qt-console/tray-monitor/tray_conf.cpp:285
#, c-format
msgid "Too many items in %s resource\n"
msgstr "Demasiados ítem en recurso %s\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:306
-#: src/qt-console/tray-monitor/tray_conf.cpp:344
+#: src/qt-console/tray-monitor/tray_conf.cpp:305
+#: src/qt-console/tray-monitor/tray_conf.cpp:343
#, c-format
msgid "Unknown resource type %d in save_resource.\n"
msgstr "Tipo de recurso desconocido %d en save_resource.\n"
diff --git a/po/es_AR.po b/po/es_AR.po
index a83038d..4ca7b06 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -1,6 +1,6 @@
# Spanish translations for branch package
# Traducciones al espa�ol para el paquete branch.
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
# License: BSD 2-Clause; see file LICENSE-FOSS
#
msgid ""
@@ -597,7 +597,7 @@ msgstr ""
#: src/console/console.c:102
#, c-format
msgid ""
-"Copyright (C) 2000-2015 Kern Sibbald
+"Copyright (C) 2000-2016 Kern Sibbald
"\n"
"Version: "
msgstr ""
@@ -1204,7 +1204,7 @@ msgstr ""
#: src/dird/dird.c:71
#, c-format
msgid ""
-"Copyright (C) 2000-2015 Kern Sibbald
+"Copyright (C) 2000-2016 Kern Sibbald
"\n"
"Version: %s (%s)\n"
"\n"
@@ -5443,7 +5443,7 @@ msgstr ""
#: src/filed/filed.c:62
#, c-format
msgid ""
-"Copyright (C) 2000-2015 Kern Sibbald
+"Copyright (C) 2000-2016 Kern Sibbald
"\n"
"Version: %s (%s)\n"
"\n"
@@ -6279,7 +6279,7 @@ msgstr ""
#: src/gnome2-console/console.c:88
#, c-format
msgid ""
-"Copyright (C) 2000-2015 Kern Sibbald
+"Copyright (C) 2000-2016 Kern Sibbald
"\n"
"Version: %s (%s) %s %s %s\n"
"\n"
@@ -8852,7 +8852,7 @@ msgstr ""
#: src/stored/bcopy.c:58
#, c-format
msgid ""
-"Copyright (C) 2000-2015 Kern Sibbald
+"Copyright (C) 2000-2016 Kern Sibbald
"\n"
"Version: %s (%s)\n"
"\n"
@@ -8923,7 +8923,7 @@ msgstr ""
#: src/stored/bextract.c:70
#, c-format
msgid ""
-"Copyright (C) 2000-2015 Kern Sibbald
+"Copyright (C) 2000-2016 Kern Sibbald
"\n"
"Version: %s (%s)\n"
"\n"
@@ -9170,7 +9170,7 @@ msgstr ""
#: src/stored/bls.c:68
#, c-format
msgid ""
-"Copyright (C) 2000-2015 Kern Sibbald
+"Copyright (C) 2000-2016 Kern Sibbald
"\n"
"Version: %s (%s)\n"
"\n"
@@ -9266,7 +9266,7 @@ msgstr ""
#: src/stored/bscan.c:109
#, c-format
msgid ""
-"Copyright (C) 2000-2015 Kern Sibbald
+"Copyright (C) 2000-2016 Kern Sibbald
"\n"
"Version: %s (%s)\n"
"\n"
@@ -10883,7 +10883,7 @@ msgstr ""
#: src/stored/btape.c:2596
#, c-format
msgid ""
-"Copyright (C) 2000-2015 Kern Sibbald
+"Copyright (C) 2000-2016 Kern Sibbald
"\n"
"Version: %s (%s)\n"
"\n"
@@ -12489,7 +12489,7 @@ msgstr ""
#: src/stored/stored.c:65
#, c-format
msgid ""
-"Copyright (C) 2000-2015 Kern Sibbald
+"Copyright (C) 2000-2016 Kern Sibbald
"\n"
"Version: %s (%s)\n"
"\n"
@@ -13220,7 +13220,7 @@ msgstr ""
#: src/tray-monitor/tray-monitor.c:102
#, c-format
msgid ""
-"Copyright (C) 2000-2015 Kern Sibbald
+"Copyright (C) 2000-2016 Kern Sibbald
"Written by Nicolas Boichat (2004)\n"
"\n"
"Version: %s (%s) %s %s %s\n"
@@ -13321,7 +13321,7 @@ msgstr ""
#: src/tray-monitor/tray-monitor.c:503 src/tray-monitor/tray-monitor.c:513
msgid ""
-"Copyright (C) 2000-2015 Kern Sibbald
+"Copyright (C) 2000-2016 Kern Sibbald
"Written by Nicolas Boichat\n"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 15ad48a..62887e9 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,5 +1,5 @@
# Finnish translations for branch package.
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
# License: BSD 2-Clause; see file LICENSE-FOSS
#
msgid ""
diff --git a/po/fr.po b/po/fr.po
index 9552027..5e033a7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,6 @@
# French translations for Bacula package
# Traduction anglaise du package Bacula.
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
# Nicolas Boichat <nicolas at boichat.ch>, 2005.
# License: BSD 2-Clause; see file LICENSE-FOSS
#
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bacula 1.38\n"
"Report-Msgid-Bugs-To: bacula-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2015-08-09 15:05+0200\n"
+"POT-Creation-Date: 2016-01-10 15:13+0100\n"
"PO-Revision-Date: 2009-10-18 14:04+0000\n"
"Last-Translator: Eric Bollengier <eric at eb.homelinux.org>\n"
"Language-Team: French <bacula-devel-fr at lists.sourceforge.net>\n"
@@ -28,7 +28,7 @@ msgstr ""
msgid "*None*"
msgstr ""
-#: src/lib/status.h:78
+#: src/lib/status.h:77
msgid ""
"\n"
"Terminated Jobs:\n"
@@ -36,207 +36,207 @@ msgstr ""
"\n"
"Job terminés :\n"
-#: src/lib/status.h:85
+#: src/lib/status.h:84
msgid " JobId Level Files Bytes Status Finished Name \n"
msgstr " JobId Type Fichiers Octets Statut Terminé Nom\n"
-#: src/lib/status.h:87
+#: src/lib/status.h:86
msgid "===================================================================\n"
msgstr "===================================================================\n"
-#: src/lib/status.h:107
+#: src/lib/status.h:106
msgid "Created"
msgstr "Crée"
-#: src/lib/status.h:111
+#: src/lib/status.h:110
msgid "Error"
msgstr "Erreur"
-#: src/lib/status.h:114
+#: src/lib/status.h:113
msgid "Diffs"
msgstr ""
-#: src/lib/status.h:117
+#: src/lib/status.h:116
msgid "Cancel"
msgstr "Annulé"
-#: src/lib/status.h:120
+#: src/lib/status.h:119
msgid "OK"
msgstr "OK"
-#: src/lib/status.h:123
+#: src/lib/status.h:122
msgid "OK -- with warnings"
msgstr "OK -- avec des avertissements"
-#: src/lib/status.h:126
+#: src/lib/status.h:125
msgid "Incomplete"
msgstr ""
-#: src/lib/status.h:129
+#: src/lib/status.h:128
msgid "Other"
msgstr "Autre"
-#: src/lib/status.h:141
+#: src/lib/status.h:140
#, fuzzy, c-format
msgid "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n"
msgstr "%6d %-6s %8s %10s %-7s %-8s %s\n"
-#: src/lib/status.h:149
+#: src/lib/status.h:148
#, c-format
msgid "%6d %-6s %8s %10s %-7s %-8s %s\n"
msgstr "%6d %-6s %8s %10s %-7s %-8s %s\n"
-#: src/lib/status.h:178 src/lib/status.h:189 src/lib/status.h:203
-#: src/lib/status.h:207 src/lib/status.h:211
+#: src/lib/status.h:177 src/lib/status.h:188 src/lib/status.h:202
+#: src/lib/status.h:206 src/lib/status.h:210
msgid "Bacula "
msgstr "Bacula "
-#: src/qt-console/bat_conf.cpp:133
+#: src/qt-console/bat_conf.cpp:132
#, c-format
msgid "No record for %d %s\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:142
+#: src/qt-console/bat_conf.cpp:141
#, c-format
msgid "Director: name=%s address=%s DIRport=%d\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:146
+#: src/qt-console/bat_conf.cpp:145
#, fuzzy, c-format
msgid "Console: name=%s\n"
msgstr "Console connecté à %s\n"
-#: src/qt-console/bat_conf.cpp:149
-#: src/qt-console/tray-monitor/tray_conf.cpp:187
+#: src/qt-console/bat_conf.cpp:148
+#: src/qt-console/tray-monitor/tray_conf.cpp:186
#, c-format
msgid "ConsoleFont: name=%s font face=%s\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:153 src/qt-console/bat_conf.cpp:234
-#: src/qt-console/bat_conf.cpp:284 src/qt-console/bat_conf.cpp:314
+#: src/qt-console/bat_conf.cpp:152 src/qt-console/bat_conf.cpp:233
+#: src/qt-console/bat_conf.cpp:283 src/qt-console/bat_conf.cpp:313
#, c-format
msgid "Unknown resource type %d\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:262
-#: src/qt-console/tray-monitor/tray_conf.cpp:280
+#: src/qt-console/bat_conf.cpp:261
+#: src/qt-console/tray-monitor/tray_conf.cpp:279
#, c-format
msgid "%s item is required in %s resource, but not found.\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:331
-#: src/qt-console/tray-monitor/tray_conf.cpp:364
+#: src/qt-console/bat_conf.cpp:330
+#: src/qt-console/tray-monitor/tray_conf.cpp:363
#, c-format
msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:89
+#: src/qt-console/bcomm/dircomm.cpp:88
#, fuzzy, c-format
msgid "Already connected\"%s\".\n"
msgstr "Console connecté à %s\n"
-#: src/qt-console/bcomm/dircomm.cpp:100
-#: src/qt-console/tray-monitor/tray-monitor.cpp:353
+#: src/qt-console/bcomm/dircomm.cpp:99
+#: src/qt-console/tray-monitor/tray-monitor.cpp:352
#, fuzzy, c-format
msgid "Connecting to Director %s:%d"
msgstr "Connexion au Director %s:%d\n"
-#: src/qt-console/bcomm/dircomm.cpp:102
+#: src/qt-console/bcomm/dircomm.cpp:101
#, fuzzy, c-format
msgid ""
"Connecting to Director %s:%d\n"
"\n"
msgstr "Connexion au Director %s:%d\n"
-#: src/qt-console/bcomm/dircomm.cpp:154
+#: src/qt-console/bcomm/dircomm.cpp:153
#, c-format
msgid "Failed to initialize TLS context for Console \"%s\".\n"
msgstr "Impossible d'initialiser le contexte TLS pour la Console \"%s\".\n"
-#: src/qt-console/bcomm/dircomm.cpp:177
+#: src/qt-console/bcomm/dircomm.cpp:176
#, c-format
msgid "Failed to initialize TLS context for Director \"%s\".\n"
msgstr "Impossible d'initialiser le contexte TLS pour le Director \"%s\".\n"
-#: src/qt-console/bcomm/dircomm.cpp:199
-#: src/qt-console/tray-monitor/tray-monitor.cpp:358
+#: src/qt-console/bcomm/dircomm.cpp:198
+#: src/qt-console/tray-monitor/tray-monitor.cpp:357
#, fuzzy
msgid "Director daemon"
msgstr "Director"
-#: src/qt-console/bcomm/dircomm.cpp:237
+#: src/qt-console/bcomm/dircomm.cpp:236
msgid "Initializing ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:253 src/qt-console/console/console.cpp:134
+#: src/qt-console/bcomm/dircomm.cpp:252 src/qt-console/console/console.cpp:133
#, fuzzy
msgid "Connected"
msgstr "Connexion...\n"
-#: src/qt-console/bcomm/dircomm.cpp:377
+#: src/qt-console/bcomm/dircomm.cpp:376
#, fuzzy
msgid "Command completed ..."
msgstr "Commande annulée.\n"
-#: src/qt-console/bcomm/dircomm.cpp:384 src/qt-console/console/console.cpp:371
+#: src/qt-console/bcomm/dircomm.cpp:383 src/qt-console/console/console.cpp:370
msgid "Processing command ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:391
+#: src/qt-console/bcomm/dircomm.cpp:390
msgid "At main prompt waiting for input ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:398 src/qt-console/bcomm/dircomm.cpp:408
+#: src/qt-console/bcomm/dircomm.cpp:397 src/qt-console/bcomm/dircomm.cpp:407
msgid "At prompt waiting for input ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:416
+#: src/qt-console/bcomm/dircomm.cpp:415
#, fuzzy
msgid "Command failed."
msgstr "Commande annulée.\n"
-#: src/qt-console/bcomm/dircomm.cpp:488
+#: src/qt-console/bcomm/dircomm.cpp:487
#, fuzzy
msgid "Director disconnected."
msgstr "Connexion du director le %s\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:111
+#: src/qt-console/bcomm/dircomm_auth.cpp:110
#, fuzzy, c-format
msgid "Director authorization problem at \"%s:%d\"\n"
msgstr "Pas d'enregistrement trouvé en base pour : %s\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:118
+#: src/qt-console/bcomm/dircomm_auth.cpp:117
#, c-format
msgid ""
"Authorization problem: Remote server at \"%s:%d\" did not advertise required "
"TLS support.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:126
+#: src/qt-console/bcomm/dircomm_auth.cpp:125
#, c-format
msgid ""
"Authorization problem with Director at \"%s:%d\": Remote server requires "
"TLS.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:137
+#: src/qt-console/bcomm/dircomm_auth.cpp:136
#, fuzzy, c-format
msgid "TLS negotiation failed with Director at \"%s:%d\"\n"
msgstr "Négociation TLS échouée avec le SD \"%s:%d\".\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:149
+#: src/qt-console/bcomm/dircomm_auth.cpp:148
#, fuzzy, c-format
msgid ""
"Bad response to Hello command: ERR=%s\n"
"The Director at \"%s:%d\" is probably not running.\n"
msgstr "Mauvaise réponse à la commande Hello : ERR=%s\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:158
+#: src/qt-console/bcomm/dircomm_auth.cpp:157
#, fuzzy, c-format
msgid "Director at \"%s:%d\" rejected Hello command\n"
msgstr "Le File Daemon \"%s:%d\" a rejeté la commande Hello\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:173
+#: src/qt-console/bcomm/dircomm_auth.cpp:172
#, fuzzy, c-format
msgid ""
"Authorization problem with Director at \"%s:%d\"\n"
@@ -253,16 +253,16 @@ msgstr ""
"Vous trouverez de l'aide sur\n"
"http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors\n"
-#: src/qt-console/main.cpp:159
+#: src/qt-console/main.cpp:158
msgid "Cryptography library initialization failed.\n"
msgstr ""
-#: src/qt-console/main.cpp:163
+#: src/qt-console/main.cpp:162
#, c-format
msgid "Please correct configuration file: %s\n"
msgstr "Merci de corriger le fichier de configuration : %s\n"
-#: src/qt-console/main.cpp:187
+#: src/qt-console/main.cpp:186
#, fuzzy, c-format
msgid ""
"\n"
@@ -285,18 +285,18 @@ msgstr ""
" -t test - lecture de la configuration et sortie\n"
"\n"
-#: src/qt-console/main.cpp:220 src/qt-console/main.cpp:250
+#: src/qt-console/main.cpp:219 src/qt-console/main.cpp:249
msgid "TLS required but not configured in Bacula.\n"
msgstr ""
-#: src/qt-console/main.cpp:228
+#: src/qt-console/main.cpp:227
#, c-format
msgid ""
"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
"Director \"%s\" in %s. At least one CA certificate store is required.\n"
msgstr ""
-#: src/qt-console/main.cpp:237
+#: src/qt-console/main.cpp:236
#, c-format
msgid ""
"No Director resource defined in %s\n"
@@ -305,14 +305,14 @@ msgstr ""
"Pas de director défini pour %s\n"
"Sans cette définition, il n'est pas possible de se connecter à celui-ci.\n"
-#: src/qt-console/main.cpp:258
+#: src/qt-console/main.cpp:257
#, c-format
msgid ""
"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
"Console \"%s\" in %s.\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:79
+#: src/qt-console/tray-monitor/authenticate.cpp:78
#, fuzzy
msgid ""
"Director authorization problem.\n"
@@ -324,21 +324,21 @@ msgstr ""
"Vous trouverez de l'aide sur\n"
"http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:88
+#: src/qt-console/tray-monitor/authenticate.cpp:87
#, c-format
msgid "Bad response to Hello command: ERR=%s\n"
msgstr "Mauvaise réponse à la commande Hello : ERR=%s\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:95
+#: src/qt-console/tray-monitor/authenticate.cpp:94
msgid "Director rejected Hello command\n"
msgstr "Le director a rejeté la commande Hello\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:123
+#: src/qt-console/tray-monitor/authenticate.cpp:122
#, c-format
msgid "Error sending Hello to Storage daemon. ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:129
+#: src/qt-console/tray-monitor/authenticate.cpp:128
#, fuzzy
msgid ""
"Director and Storage daemon passwords or names not the same.\n"
@@ -346,22 +346,22 @@ msgid ""
msgstr ""
"Le mot de passe ou le nom du Director et du Client ne sont pas identiques.\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:136
+#: src/qt-console/tray-monitor/authenticate.cpp:135
#, fuzzy, c-format
msgid "bdird<stored: bad response to Hello command: ERR=%s\n"
msgstr ""
"bdird<stored: \"%s:%s\" Mauvaise réponse à la commande Hello : ERR=%s\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:143
+#: src/qt-console/tray-monitor/authenticate.cpp:142
msgid "Storage daemon rejected Hello command\n"
msgstr "Le storage a rejeté la commande Hello\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:169
+#: src/qt-console/tray-monitor/authenticate.cpp:168
#, fuzzy, c-format
msgid "Error sending Hello to File daemon. ERR=%s\n"
msgstr "Erreur pendant lors de la récupération du pool. ERR=%s\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:175
+#: src/qt-console/tray-monitor/authenticate.cpp:174
#, fuzzy
msgid ""
"Director and File daemon passwords or names not the same.\n"
@@ -369,16 +369,16 @@ msgid ""
msgstr ""
"Le mot de passe ou le nom du Director et du Client ne sont pas identiques.\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:182
+#: src/qt-console/tray-monitor/authenticate.cpp:181
#, c-format
msgid "Bad response from File daemon to Hello command: ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:189
+#: src/qt-console/tray-monitor/authenticate.cpp:188
msgid "File daemon rejected Hello command\n"
msgstr "Le Client a rejeté la commande Hello\\n\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:59
+#: src/qt-console/tray-monitor/tray-monitor.cpp:58
#, fuzzy, c-format
msgid ""
"\n"
@@ -401,14 +401,14 @@ msgstr ""
" -t test - lecture de la configuration et sortie\n"
"\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:210
+#: src/qt-console/tray-monitor/tray-monitor.cpp:209
#, c-format
msgid ""
"Error: %d Monitor resources defined in %s. You must define one and only one "
"Monitor resource.\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:242
+#: src/qt-console/tray-monitor/tray-monitor.cpp:241
#, fuzzy, c-format
msgid ""
"No Client, Storage or Director resource defined in %s\n"
@@ -418,7 +418,7 @@ msgstr ""
"Pas de director défini pour %s\n"
"Sans cette définition, il n'est pas possible de se connecter à celui-ci.\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:257
+#: src/qt-console/tray-monitor/tray-monitor.cpp:256
#, c-format
msgid ""
"Invalid refresh interval defined in %s\n"
@@ -426,111 +426,111 @@ msgid ""
"minutes (read value: %d).\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:325
+#: src/qt-console/tray-monitor/tray-monitor.cpp:324
#, c-format
msgid "Error, currentitem is not a Client or a Storage..\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:363
+#: src/qt-console/tray-monitor/tray-monitor.cpp:362
#, fuzzy, c-format
msgid "Connecting to Client %s:%d"
msgstr "Connexion au client %s (%s:%d)\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:368
+#: src/qt-console/tray-monitor/tray-monitor.cpp:367
msgid "File daemon"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:373
+#: src/qt-console/tray-monitor/tray-monitor.cpp:372
#, fuzzy, c-format
msgid "Connecting to Storage %s:%d"
msgstr "Connexion au Director %s:%d\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:378
+#: src/qt-console/tray-monitor/tray-monitor.cpp:377
msgid "Storage daemon"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:382
-#: src/qt-console/tray-monitor/tray-monitor.cpp:412
+#: src/qt-console/tray-monitor/tray-monitor.cpp:381
+#: src/qt-console/tray-monitor/tray-monitor.cpp:411
#, c-format
msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:387
+#: src/qt-console/tray-monitor/tray-monitor.cpp:386
#, fuzzy
msgid "Cannot connect to daemon."
msgstr "Impossible de se connecter au démon Storage\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:396
+#: src/qt-console/tray-monitor/tray-monitor.cpp:395
#, fuzzy, c-format
msgid "Authentication error : %s"
msgstr "Erreur sur l'autochangeur : ERR=%s\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:403
+#: src/qt-console/tray-monitor/tray-monitor.cpp:402
#, fuzzy
msgid "Opened connection with Director daemon."
msgstr "Impossible de se connecter au Storage daemon.\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:406
+#: src/qt-console/tray-monitor/tray-monitor.cpp:405
#, fuzzy
msgid "Opened connection with File daemon."
msgstr "Impossible de se connecter au client.\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:409
+#: src/qt-console/tray-monitor/tray-monitor.cpp:408
#, fuzzy
msgid "Opened connection with Storage daemon."
msgstr "Impossible de se connecter au Storage daemon.\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:460
+#: src/qt-console/tray-monitor/tray-monitor.cpp:459
msgid "Error : BNET_HARDEOF or BNET_ERROR"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:469
+#: src/qt-console/tray-monitor/tray-monitor.cpp:468
#, fuzzy
msgid "Error : Connection closed."
msgstr "Connexion...\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:160
+#: src/qt-console/tray-monitor/tray_conf.cpp:159
#, c-format
msgid "No %s resource defined\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:169
+#: src/qt-console/tray-monitor/tray_conf.cpp:168
#, c-format
msgid "Monitor: name=%s FDtimeout=%s SDtimeout=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:175
+#: src/qt-console/tray-monitor/tray_conf.cpp:174
#, c-format
msgid "Director: name=%s address=%s FDport=%d\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:179
+#: src/qt-console/tray-monitor/tray_conf.cpp:178
#, fuzzy, c-format
msgid "Client: name=%s address=%s FDport=%d\n"
msgstr "Client \"%s\" adresse positionné à %s\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:183
+#: src/qt-console/tray-monitor/tray_conf.cpp:182
#, c-format
msgid "Storage: name=%s address=%s SDport=%d\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:191
+#: src/qt-console/tray-monitor/tray_conf.cpp:190
#, c-format
msgid "Unknown resource type %d in dump_resource.\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:249
+#: src/qt-console/tray-monitor/tray_conf.cpp:248
#, c-format
msgid "Unknown resource type %d in free_resource.\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:286
+#: src/qt-console/tray-monitor/tray_conf.cpp:285
#, c-format
msgid "Too many items in %s resource\n"
msgstr "Trop d'élément dans la ressource %s\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:306
-#: src/qt-console/tray-monitor/tray_conf.cpp:344
+#: src/qt-console/tray-monitor/tray_conf.cpp:305
+#: src/qt-console/tray-monitor/tray_conf.cpp:343
#, c-format
msgid "Unknown resource type %d in save_resource.\n"
msgstr ""
@@ -6665,7 +6665,7 @@ msgstr ""
#~ " -? print this message\n"
#~ "\n"
#~ msgstr ""
-#~ "Copyright (C) 2000-2015 Kern Sibbald\n"
+#~ "Copyright (C) 2000-2016 Kern Sibbald\n"
#~ "Version : %s (%s)\n"
#~ "\n"
#~ "Usage : dird [-f -s] [-c config_file] [-d debug_level] [config_file]\n"
@@ -6787,7 +6787,7 @@ msgstr ""
#~ " -? print this message\n"
#~ "\n"
#~ msgstr ""
-#~ "Copyright (C) 2000-2015 Kern Sibbald\n"
+#~ "Copyright (C) 2000-2016 Kern Sibbald\n"
#~ "Version : %s (%s)\n"
#~ "\n"
#~ "Usage : dird [-f -s] [-c config_file] [-d debug_level] [config_file]\n"
@@ -6834,7 +6834,7 @@ msgstr ""
#~ " -? print this message\n"
#~ "\n"
#~ msgstr ""
-#~ "Copyright (C) 2000-2015 Kern Sibbald\n"
+#~ "Copyright (C) 2000-2016 Kern Sibbald\n"
#~ "Version : %s (%s)\n"
#~ "\n"
#~ "Usage : dird [-f -s] [-c config_file] [-d debug_level] [config_file]\n"
@@ -8226,7 +8226,7 @@ msgstr ""
#~ " -? print this message\n"
#~ "\n"
#~ msgstr ""
-#~ "Copyright (C) 2000-2015 Kern Sibbald\n"
+#~ "Copyright (C) 2000-2016 Kern Sibbald\n"
#~ "Version : %s (%s)\n"
#~ "\n"
#~ "Usage : dird [-f -s] [-c config_file] [-d debug_level] [config_file]\n"
@@ -8336,7 +8336,7 @@ msgstr ""
#~ " -? print this message\n"
#~ "\n"
#~ msgstr ""
-#~ "Copyright (C) 2000-2015 Kern Sibbald\n"
+#~ "Copyright (C) 2000-2016 Kern Sibbald\n"
#~ "Version : %s (%s)\n"
#~ "\n"
#~ "Usage : dird [-f -s] [-c config_file] [-d debug_level] [config_file]\n"
@@ -8371,7 +8371,7 @@ msgstr ""
#~ " -? print this message\n"
#~ "\n"
#~ msgstr ""
-#~ "Copyright (C) 2000-2015 Kern Sibbald\n"
+#~ "Copyright (C) 2000-2016 Kern Sibbald\n"
#~ "Version : %s (%s)\n"
#~ "\n"
#~ "Usage : dird [-f -s] [-c config_file] [-d debug_level] [config_file]\n"
@@ -9586,7 +9586,7 @@ msgstr ""
#, fuzzy
#~ msgid "Copyright (c) 2000 - 2004, Kern Sibbald and John Walker"
#~ msgstr ""
-#~ "Copyright (C) 2000-2015 Kern Sibbald\n"
+#~ "Copyright (C) 2000-2016 Kern Sibbald\n"
#~ "Version : "
#, fuzzy
@@ -9995,7 +9995,7 @@ msgstr ""
#~ " -? print this message.\n"
#~ "\n"
#~ msgstr ""
-#~ "Copyright (C) 2000-2015 Kern Sibbald\n"
+#~ "Copyright (C) 2000-2016 Kern Sibbald\n"
#~ "Version : %s (%s)\n"
#~ "\n"
#~ "Usage : dird [-f -s] [-c config_file] [-d debug_level] [config_file]\n"
@@ -10015,9 +10015,9 @@ msgstr ""
#~ msgstr "Impossible d'écrire au bloc %u.\n"
#, fuzzy
-#~ msgid "Copyright (C) 2000-2015 Kern SibbaldWritten by Nicolas Boichat\n"
+#~ msgid "Copyright (C) 2000-2016 Kern SibbaldWritten by Nicolas Boichat\n"
#~ msgstr ""
-#~ "Copyright (C) 2000-2015 Kern Sibbald\n"
+#~ "Copyright (C) 2000-2016 Kern Sibbald\n"
#~ "Version : "
#~ msgid "Using default Catalog name=%s DB=%s\n"
diff --git a/po/it.po b/po/it.po
index 41ed2b2..a49ad03 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1083,7 +1083,6 @@ msgstr ""
#: src/filed/filed.c:288 src/filed/filed.c:446
#: src/gnome2-console/console.c:153 src/gnome2-console/console.c:182
#: src/stored/stored.c:332 src/wx-console/console_thread.cpp:114
-#: src/wx-console/console_thread.cpp:140
msgid "TLS required but not configured in Bacula.\n"
msgstr ""
@@ -1473,7 +1472,6 @@ msgstr ""
#: src/dird/dird_conf.c:1231 src/dird/dird_conf.c:1246
#: src/dird/dird_conf.c:1842 src/console/console_conf.c:257
#: src/filed/filed_conf.c:347 src/gnome2-console/console_conf.c:258
-#: src/tray-monitor/tray_conf.c:288 src/wx-console/console_conf.c:265
#, c-format
msgid "%s item is required in %s resource, but not found.\n"
msgstr ""
@@ -2965,33 +2963,12 @@ msgid "Director"
msgstr ""
#: src/dird/ua_cmds.c:998 src/dird/ua_dotcmds.c:284 src/dird/ua_run.c:265
-#: src/dird/ua_select.c:168 src/wx-console/wxbrestorepanel.cpp:339
-#: src/wx-console/wxbrestorepanel.cpp:355
-#: src/wx-console/wxbrestorepanel.cpp:479
-#: src/wx-console/wxbrestorepanel.cpp:480
-#: src/wx-console/wxbrestorepanel.cpp:490
-#: src/wx-console/wxbrestorepanel.cpp:491
-#: src/wx-console/wxbrestorepanel.cpp:1154
-#: src/wx-console/wxbrestorepanel.cpp:1818
-#: src/wx-console/wxbrestorepanel.cpp:1889
+#: src/dird/ua_select.c:168
msgid "Storage"
msgstr ""
#: src/dird/ua_cmds.c:999 src/dird/ua_dotcmds.c:285 src/dird/ua_run.c:271
#: src/dird/ua_select.c:311 src/dird/ua_select.c:420
-#: src/wx-console/wxbrestorepanel.cpp:336
-#: src/wx-console/wxbrestorepanel.cpp:354
-#: src/wx-console/wxbrestorepanel.cpp:431
-#: src/wx-console/wxbrestorepanel.cpp:432
-#: src/wx-console/wxbrestorepanel.cpp:442
-#: src/wx-console/wxbrestorepanel.cpp:443
-#: src/wx-console/wxbrestorepanel.cpp:690
-#: src/wx-console/wxbrestorepanel.cpp:1124
-#: src/wx-console/wxbrestorepanel.cpp:1211
-#: src/wx-console/wxbrestorepanel.cpp:1811
-#: src/wx-console/wxbrestorepanel.cpp:1813
-#: src/wx-console/wxbrestorepanel.cpp:1887
-#: src/wx-console/wxbrestorepanel.cpp:1943
msgid "Client"
msgstr ""
@@ -3705,7 +3682,6 @@ msgid "Enter a list of directories to restore for found JobIds"
msgstr ""
#: src/dird/ua_restore.c:418 src/dird/ua_status.c:760 src/filed/status.c:256
-#: src/stored/status.c:521 src/wx-console/wxbconfigpanel.cpp:212
msgid "Cancel"
msgstr ""
@@ -3999,23 +3975,16 @@ msgstr ""
msgid "Restore Client"
msgstr ""
-#: src/dird/ua_run.c:273 src/wx-console/wxbrestorepanel.cpp:356
-#: src/wx-console/wxbrestorepanel.cpp:844
-#: src/wx-console/wxbrestorepanel.cpp:1891
+#: src/dird/ua_run.c:273
msgid "When"
msgstr ""
-#: src/dird/ua_run.c:274 src/wx-console/wxbrestorepanel.cpp:357
-#: src/wx-console/wxbrestorepanel.cpp:1117
-#: src/wx-console/wxbrestorepanel.cpp:1894
+#: src/dird/ua_run.c:274
msgid "Priority"
msgstr ""
#: src/dird/ua_run.c:278 src/dird/ua_select.c:506 src/dird/ua_select.c:596
-#: src/dird/ua_update.c:529 src/wx-console/wxbrestorepanel.cpp:338
-#: src/wx-console/wxbrestorepanel.cpp:527
-#: src/wx-console/wxbrestorepanel.cpp:537
-#: src/wx-console/wxbrestorepanel.cpp:1807
+#: src/dird/ua_update.c:529
msgid "Pool"
msgstr ""
@@ -4023,14 +3992,11 @@ msgstr ""
msgid "Verify Job"
msgstr ""
-#: src/dird/ua_run.c:283 src/wx-console/wxbrestorepanel.cpp:349
-#: src/wx-console/wxbrestorepanel.cpp:1872
+#: src/dird/ua_run.c:283
msgid "Bootstrap"
msgstr ""
-#: src/dird/ua_run.c:284 src/wx-console/wxbrestorepanel.cpp:350
-#: src/wx-console/wxbrestorepanel.cpp:1093
-#: src/wx-console/wxbrestorepanel.cpp:1874
+#: src/dird/ua_run.c:284
msgid "Where"
msgstr ""
@@ -4038,13 +4004,7 @@ msgstr ""
msgid "File Relocation"
msgstr ""
-#: src/dird/ua_run.c:286 src/wx-console/wxbrestorepanel.cpp:352
-#: src/wx-console/wxbrestorepanel.cpp:1101
-#: src/wx-console/wxbrestorepanel.cpp:1878
-#: src/wx-console/wxbrestorepanel.cpp:1879
-#: src/wx-console/wxbrestorepanel.cpp:1880
-#: src/wx-console/wxbrestorepanel.cpp:1881
-#: src/wx-console/wxbrestorepanel.cpp:1882
+#: src/dird/ua_run.c:286
msgid "Replace"
msgstr ""
@@ -5021,7 +4981,6 @@ msgstr ""
#: src/dird/ua_status.c:763 src/filed/status.c:259 src/lib/util.c:188
#: src/lib/util.c:255 src/stored/btape.c:1189 src/stored/status.c:524
-#: src/wx-console/wxbconfigpanel.cpp:201
msgid "OK"
msgstr ""
@@ -5790,7 +5749,7 @@ msgstr ""
msgid "File: %s\n"
msgstr ""
-#: src/console/authenticate.c:131 src/wx-console/authenticate.c:142
+#: src/console/authenticate.c:131
msgid "TLS negotiation failed\n"
msgstr ""
@@ -5801,20 +5760,10 @@ msgid "Bad response to Hello command: ERR=%s\n"
msgstr ""
#: src/console/authenticate.c:150 src/gnome2-console/authenticate.c:108
-#: src/tray-monitor/authenticate.c:104 src/wx-console/authenticate.c:157
+#: src/tray-monitor/authenticate.c:104
msgid "Director rejected Hello command\n"
msgstr ""
-#: src/console/authenticate.c:160 src/wx-console/authenticate.c:167
-msgid ""
-"Director authorization problem.\n"
-"Most likely the passwords do not agree.\n"
-"If you are using TLS, there may have been a certificate validation error "
-"during the TLS handshake.\n"
-"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for "
-"help.\n"
-msgstr ""
-
#: src/console/console.c:114
#, c-format
msgid ""
@@ -5902,13 +5851,11 @@ msgid "Connecting to Director %s:%d\n"
msgstr ""
#: src/console/console.c:538 src/gnome2-console/console.c:526
-#: src/wx-console/console_thread.cpp:391
#, c-format
msgid "Failed to initialize TLS context for Console \"%s\".\n"
msgstr ""
#: src/console/console.c:558 src/gnome2-console/console.c:548
-#: src/wx-console/console_thread.cpp:412
#, c-format
msgid "Failed to initialize TLS context for Director \"%s\".\n"
msgstr ""
@@ -5974,19 +5921,17 @@ msgstr ""
msgid "Autochanger error: ERR=%s\n"
msgstr ""
-#: src/console/console_conf.c:138 src/gnome2-console/console_conf.c:134
-#: src/wx-console/console_conf.c:147
+#: src/console/console_conf.c:138
#, c-format
msgid "No record for %d %s\n"
msgstr ""
-#: src/console/console_conf.c:147 src/wx-console/console_conf.c:156
+#: src/console/console_conf.c:147
#, c-format
msgid "Console: name=%s rcfile=%s histfile=%s\n"
msgstr ""
#: src/console/console_conf.c:151 src/gnome2-console/console_conf.c:143
-#: src/wx-console/console_conf.c:160
#, c-format
msgid "Director: name=%s address=%s DIRport=%d\n"
msgstr ""
@@ -5995,11 +5940,7 @@ msgstr ""
#: src/console/console_conf.c:276 src/console/console_conf.c:303
#: src/filed/filed_conf.c:319 src/filed/filed_conf.c:384
#: src/filed/filed_conf.c:414 src/gnome2-console/console_conf.c:154
-#: src/gnome2-console/console_conf.c:232 src/gnome2-console/console_conf.c:280
-#: src/gnome2-console/console_conf.c:310 src/stored/stored_conf.c:528
#: src/stored/stored_conf.c:616 src/stored/stored_conf.c:651
-#: src/wx-console/console_conf.c:164 src/wx-console/console_conf.c:239
-#: src/wx-console/console_conf.c:284 src/wx-console/console_conf.c:311
#, c-format
msgid "Unknown resource type %d\n"
msgstr ""
@@ -7290,345 +7231,6 @@ msgstr ""
msgid "Cannot return to saved working directory: %s\n"
msgstr ""
-#: src/gnome2-console/authenticate.c:87
-#, c-format
-msgid "%s: Director authorization problem.\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:88
-msgid "Director authorization problem.\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:90
-msgid ""
-"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for "
-"help.\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:100
-#, c-format
-msgid "%s: Bad response to Hello command: ERR=%s\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:102
-msgid "The Director is probably not running.\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:102
-#, c-format
-msgid ""
-"\n"
-"Version: %s (%s) %s %s %s\n"
-"\n"
-"Usage: bgnome-console [-s] [-c config_file] [-d debug_level] [config_file]\n"
-" -c <file> set configuration file to file\n"
-" -dnn set debug level to nn\n"
-" -s no signals\n"
-" -t test - read configuration and exit\n"
-" -? print this message.\n"
-"\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:234
-#, c-format
-msgid "Pthread cond init error = %s\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:379
-msgid " Not Connected"
-msgstr ""
-
-#: src/gnome2-console/console.c:500
-#, c-format
-msgid " Connecting to Director %s:%d"
-msgstr ""
-
-#: src/gnome2-console/console.c:501
-#, c-format
-msgid ""
-"Connecting to Director %s:%d\n"
-"\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:516 src/wx-console/console_thread.cpp:381
-#, c-format
-msgid "Passphrase for Console \"%s\" TLS private key: "
-msgstr ""
-
-#: src/gnome2-console/console.c:538 src/wx-console/console_thread.cpp:402
-#, c-format
-msgid "Passphrase for Director \"%s\" TLS private key: "
-msgstr ""
-
-#: src/gnome2-console/console.c:557 src/tray-monitor/tray-monitor.c:907
-#: src/wx-console/console_thread.cpp:420
-msgid "Director daemon"
-msgstr ""
-
-#: src/gnome2-console/console.c:569
-msgid " Initializing ..."
-msgstr ""
-
-#: src/gnome2-console/console.c:605
-msgid " Connected"
-msgstr ""
-
-#: src/gnome2-console/console.c:613
-msgid " Processing command ..."
-msgstr ""
-
-#: src/gnome2-console/console.c:648
-msgid " At prompt waiting for input ..."
-msgstr ""
-
-#: src/gnome2-console/console.c:768
-msgid " Ready"
-msgstr ""
-
-#: src/gnome2-console/console_conf.c:147
-#, c-format
-msgid "Console: name=%s\n"
-msgstr ""
-
-#: src/gnome2-console/console_conf.c:150 src/tray-monitor/tray_conf.c:195
-#, c-format
-msgid "ConsoleFont: name=%s font face=%s\n"
-msgstr ""
-
-#: src/gnome2-console/interface.c:202
-msgid "Bacula Console"
-msgstr ""
-
-#: src/gnome2-console/interface.c:235 src/wx-console/wxbmainframe.cpp:248
-#: src/wx-console/wxbmainframe.cpp:619
-msgid "Connect"
-msgstr ""
-
-#: src/gnome2-console/interface.c:238
-msgid "Connect to Director"
-msgstr ""
-
-#: src/gnome2-console/interface.c:242
-msgid "Run"
-msgstr ""
-
-#: src/gnome2-console/interface.c:245 src/gnome2-console/interface.c:682
-#: src/gnome2-console/interface.c:696
-msgid "Run a Job"
-msgstr ""
-
-#: src/gnome2-console/interface.c:249
-msgid "Dir Status"
-msgstr ""
-
-#: src/gnome2-console/interface.c:255 src/lib/util.c:293
-#: src/wx-console/wxbrestorepanel.cpp:404
-#: src/wx-console/wxbrestorepanel.cpp:1974
-msgid "Restore"
-msgstr ""
-
-#: src/gnome2-console/interface.c:261
-msgid "Label"
-msgstr ""
-
-#: src/gnome2-console/interface.c:267
-msgid "Msgs"
-msgstr ""
-
-#: src/gnome2-console/interface.c:270
-msgid "Display Messages"
-msgstr ""
-
-#: src/gnome2-console/interface.c:294
-msgid " Command: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:303
-msgid "Enter Commands Here"
-msgstr ""
-
-#: src/gnome2-console/interface.c:314
-msgid " Status: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:323 src/gnome2-console/interface.c:1709
-msgid " "
-msgstr ""
-
-#: src/gnome2-console/interface.c:424
-msgid "About Bacula Console"
-msgstr ""
-
-#: src/gnome2-console/interface.c:439
-msgid "Bacula Console\n"
-msgstr ""
-
-#: src/gnome2-console/interface.c:448
-msgid "Copyright (c) 2000 - 2004, Kern Sibbald and John Walker"
-msgstr ""
-
-#: src/gnome2-console/interface.c:453
-msgid "Authors: Kern Sibbald and John Walker"
-msgstr ""
-
-#: src/gnome2-console/interface.c:458
-msgid "The Leading Open Source Backup Solution."
-msgstr ""
-
-#: src/gnome2-console/interface.c:523 src/gnome2-console/interface.c:540
-msgid "Select Director"
-msgstr ""
-
-#: src/gnome2-console/interface.c:570
-msgid " "
-msgstr ""
-
-#: src/gnome2-console/interface.c:715 src/gnome2-console/interface.c:1631
-msgid "Job:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:736
-msgid " Type:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:756 src/gnome2-console/interface.c:785
-#: src/gnome2-console/interface.c:1284 src/gnome2-console/interface.c:1680
-msgid " "
-msgstr ""
-
-#: src/gnome2-console/interface.c:765 src/gnome2-console/interface.c:1660
-#: src/wx-console/wxbrestorepanel.cpp:1886
-msgid "Client:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:795 src/gnome2-console/interface.c:1689
-msgid "FileSet: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:820 src/wx-console/wxbrestorepanel.cpp:1893
-msgid "Priority:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:836
-msgid "Level:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:857
-msgid " "
-msgstr ""
-
-#: src/gnome2-console/interface.c:867 src/gnome2-console/interface.c:1433
-#: src/gnome2-console/interface.c:1718
-msgid "Pool:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:888 src/gnome2-console/interface.c:919
-#: src/gnome2-console/interface.c:949 src/gnome2-console/interface.c:969
-#: src/gnome2-console/interface.c:989 src/gnome2-console/interface.c:1009
-#: src/gnome2-console/interface.c:1014 src/gnome2-console/interface.c:1483
-#: src/gnome2-console/interface.c:1739 src/gnome2-console/interface.c:1769
-#: src/gnome2-console/interface.c:1788 src/gnome2-console/interface.c:1793
-msgid " "
-msgstr ""
-
-#: src/gnome2-console/interface.c:898 src/gnome2-console/interface.c:1407
-#: src/gnome2-console/interface.c:1748 src/wx-console/wxbrestorepanel.cpp:1888
-msgid "Storage:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:929
-msgid "Messages:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:959
-msgid "Where: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:979 src/wx-console/wxbrestorepanel.cpp:1890
-msgid "When:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:999 src/wx-console/wxbrestorepanel.cpp:1871
-msgid "Bootstrap:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1194
-msgid "Restore File Selection"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1238
-msgid "Current dir:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1265
-msgid "Files Selected: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:1385 src/gnome2-console/interface.c:1396
-msgid "Label a Volume"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1458
-msgid "Volume Name:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1472
-msgid "Slot:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1598
-msgid "Restore Files Dialog"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1613
-msgid "Restore Files"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1778
-msgid "Before:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1824
-msgid "Select Files"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1907
-msgid "Progress"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149
-msgid "Mark"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149
-msgid "File"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149
-msgid "Mode"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:306
-msgid "User"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:310
-msgid "Group"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:294
-msgid "Size"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:298
-msgid "Date"
-msgstr ""
-
-#: src/gnome2-console/support.c:60 src/gnome2-console/support.c:85
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
#: src/lib/address_conf.c:63
#, c-format
msgid "Only ipv4 and ipv6 are supported (%d)\n"
diff --git a/po/nl.po b/po/nl.po
index 191c524..d159354 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,5 +1,5 @@
# Dutch translation of Bacula
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
# License: BSD 2-Clause; see file LICENSE-FOSS
# W. van den Akker <wvdakker at wilsoft.nl>, 2012
#
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bacula 5.2.7\n"
"Report-Msgid-Bugs-To: bacula-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2015-08-09 15:05+0200\n"
+"POT-Creation-Date: 2016-01-10 15:13+0100\n"
"PO-Revision-Date: 2012-05-05 11:52+0100\n"
"Last-Translator: W. van den Akker <wvdakker at wilsoft.nl>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -26,118 +26,118 @@ msgstr ""
msgid "*None*"
msgstr "*Geen*"
-#: src/lib/status.h:78
+#: src/lib/status.h:77
msgid ""
"\n"
"Terminated Jobs:\n"
msgstr ""
-#: src/lib/status.h:85
+#: src/lib/status.h:84
msgid " JobId Level Files Bytes Status Finished Name \n"
msgstr ""
-#: src/lib/status.h:87
+#: src/lib/status.h:86
msgid "===================================================================\n"
msgstr ""
-#: src/lib/status.h:107
+#: src/lib/status.h:106
msgid "Created"
msgstr ""
-#: src/lib/status.h:111
+#: src/lib/status.h:110
msgid "Error"
msgstr ""
-#: src/lib/status.h:114
+#: src/lib/status.h:113
msgid "Diffs"
msgstr ""
-#: src/lib/status.h:117
+#: src/lib/status.h:116
msgid "Cancel"
msgstr ""
-#: src/lib/status.h:120
+#: src/lib/status.h:119
msgid "OK"
msgstr ""
-#: src/lib/status.h:123
+#: src/lib/status.h:122
msgid "OK -- with warnings"
msgstr ""
-#: src/lib/status.h:126
+#: src/lib/status.h:125
msgid "Incomplete"
msgstr ""
-#: src/lib/status.h:129
+#: src/lib/status.h:128
msgid "Other"
msgstr ""
-#: src/lib/status.h:141
+#: src/lib/status.h:140
#, c-format
msgid "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n"
msgstr ""
-#: src/lib/status.h:149
+#: src/lib/status.h:148
#, c-format
msgid "%6d %-6s %8s %10s %-7s %-8s %s\n"
msgstr ""
-#: src/lib/status.h:178 src/lib/status.h:189 src/lib/status.h:203
-#: src/lib/status.h:207 src/lib/status.h:211
+#: src/lib/status.h:177 src/lib/status.h:188 src/lib/status.h:202
+#: src/lib/status.h:206 src/lib/status.h:210
msgid "Bacula "
msgstr ""
-#: src/qt-console/bat_conf.cpp:133
+#: src/qt-console/bat_conf.cpp:132
#, c-format
msgid "No record for %d %s\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:142
+#: src/qt-console/bat_conf.cpp:141
#, c-format
msgid "Director: name=%s address=%s DIRport=%d\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:146
+#: src/qt-console/bat_conf.cpp:145
#, c-format
msgid "Console: name=%s\n"
msgstr "Console: naam=%s\n"
-#: src/qt-console/bat_conf.cpp:149
-#: src/qt-console/tray-monitor/tray_conf.cpp:187
+#: src/qt-console/bat_conf.cpp:148
+#: src/qt-console/tray-monitor/tray_conf.cpp:186
#, c-format
msgid "ConsoleFont: name=%s font face=%s\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:153 src/qt-console/bat_conf.cpp:234
-#: src/qt-console/bat_conf.cpp:284 src/qt-console/bat_conf.cpp:314
+#: src/qt-console/bat_conf.cpp:152 src/qt-console/bat_conf.cpp:233
+#: src/qt-console/bat_conf.cpp:283 src/qt-console/bat_conf.cpp:313
#, c-format
msgid "Unknown resource type %d\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:262
-#: src/qt-console/tray-monitor/tray_conf.cpp:280
+#: src/qt-console/bat_conf.cpp:261
+#: src/qt-console/tray-monitor/tray_conf.cpp:279
#, c-format
msgid "%s item is required in %s resource, but not found.\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:331
-#: src/qt-console/tray-monitor/tray_conf.cpp:364
+#: src/qt-console/bat_conf.cpp:330
+#: src/qt-console/tray-monitor/tray_conf.cpp:363
#, c-format
msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:89
+#: src/qt-console/bcomm/dircomm.cpp:88
#, c-format
msgid "Already connected\"%s\".\n"
msgstr "Al verbonden\"%s\".\n"
-#: src/qt-console/bcomm/dircomm.cpp:100
-#: src/qt-console/tray-monitor/tray-monitor.cpp:353
+#: src/qt-console/bcomm/dircomm.cpp:99
+#: src/qt-console/tray-monitor/tray-monitor.cpp:352
#, c-format
msgid "Connecting to Director %s:%d"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:102
+#: src/qt-console/bcomm/dircomm.cpp:101
#, c-format
msgid ""
"Connecting to Director %s:%d\n"
@@ -146,90 +146,90 @@ msgstr ""
"Verbinden met Director %s:%d\n"
"\n"
-#: src/qt-console/bcomm/dircomm.cpp:154
+#: src/qt-console/bcomm/dircomm.cpp:153
#, c-format
msgid "Failed to initialize TLS context for Console \"%s\".\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:177
+#: src/qt-console/bcomm/dircomm.cpp:176
#, c-format
msgid "Failed to initialize TLS context for Director \"%s\".\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:199
-#: src/qt-console/tray-monitor/tray-monitor.cpp:358
+#: src/qt-console/bcomm/dircomm.cpp:198
+#: src/qt-console/tray-monitor/tray-monitor.cpp:357
msgid "Director daemon"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:237
+#: src/qt-console/bcomm/dircomm.cpp:236
msgid "Initializing ..."
msgstr "Initialiseren ..."
-#: src/qt-console/bcomm/dircomm.cpp:253 src/qt-console/console/console.cpp:134
+#: src/qt-console/bcomm/dircomm.cpp:252 src/qt-console/console/console.cpp:133
msgid "Connected"
msgstr "Verbonden"
-#: src/qt-console/bcomm/dircomm.cpp:377
+#: src/qt-console/bcomm/dircomm.cpp:376
msgid "Command completed ..."
msgstr "Opdracht gereed ..."
-#: src/qt-console/bcomm/dircomm.cpp:384 src/qt-console/console/console.cpp:371
+#: src/qt-console/bcomm/dircomm.cpp:383 src/qt-console/console/console.cpp:370
msgid "Processing command ..."
msgstr "Opdracht aan het uitvoeren ..."
-#: src/qt-console/bcomm/dircomm.cpp:391
+#: src/qt-console/bcomm/dircomm.cpp:390
msgid "At main prompt waiting for input ..."
msgstr "Wacht op invoer op opdrachtregel in hoofdscherm ..."
-#: src/qt-console/bcomm/dircomm.cpp:398 src/qt-console/bcomm/dircomm.cpp:408
+#: src/qt-console/bcomm/dircomm.cpp:397 src/qt-console/bcomm/dircomm.cpp:407
msgid "At prompt waiting for input ..."
msgstr "Wacht op invoer op opdrachtregel ..."
-#: src/qt-console/bcomm/dircomm.cpp:416
+#: src/qt-console/bcomm/dircomm.cpp:415
msgid "Command failed."
msgstr "Opdracht mislukt."
-#: src/qt-console/bcomm/dircomm.cpp:488
+#: src/qt-console/bcomm/dircomm.cpp:487
msgid "Director disconnected."
msgstr "Director niet verbonden."
-#: src/qt-console/bcomm/dircomm_auth.cpp:111
+#: src/qt-console/bcomm/dircomm_auth.cpp:110
#, c-format
msgid "Director authorization problem at \"%s:%d\"\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:118
+#: src/qt-console/bcomm/dircomm_auth.cpp:117
#, c-format
msgid ""
"Authorization problem: Remote server at \"%s:%d\" did not advertise required "
"TLS support.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:126
+#: src/qt-console/bcomm/dircomm_auth.cpp:125
#, c-format
msgid ""
"Authorization problem with Director at \"%s:%d\": Remote server requires "
"TLS.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:137
+#: src/qt-console/bcomm/dircomm_auth.cpp:136
#, c-format
msgid "TLS negotiation failed with Director at \"%s:%d\"\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:149
+#: src/qt-console/bcomm/dircomm_auth.cpp:148
#, c-format
msgid ""
"Bad response to Hello command: ERR=%s\n"
"The Director at \"%s:%d\" is probably not running.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:158
+#: src/qt-console/bcomm/dircomm_auth.cpp:157
#, c-format
msgid "Director at \"%s:%d\" rejected Hello command\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:173
+#: src/qt-console/bcomm/dircomm_auth.cpp:172
#, c-format
msgid ""
"Authorization problem with Director at \"%s:%d\"\n"
@@ -239,16 +239,16 @@ msgid ""
"For help, please see "
msgstr ""
-#: src/qt-console/main.cpp:159
+#: src/qt-console/main.cpp:158
msgid "Cryptography library initialization failed.\n"
msgstr ""
-#: src/qt-console/main.cpp:163
+#: src/qt-console/main.cpp:162
#, c-format
msgid "Please correct configuration file: %s\n"
msgstr ""
-#: src/qt-console/main.cpp:187
+#: src/qt-console/main.cpp:186
#, fuzzy, c-format
msgid ""
"\n"
@@ -274,88 +274,88 @@ msgstr ""
" -? geef deze melding.\n"
"\n"
-#: src/qt-console/main.cpp:220 src/qt-console/main.cpp:250
+#: src/qt-console/main.cpp:219 src/qt-console/main.cpp:249
msgid "TLS required but not configured in Bacula.\n"
msgstr ""
-#: src/qt-console/main.cpp:228
+#: src/qt-console/main.cpp:227
#, c-format
msgid ""
"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
"Director \"%s\" in %s. At least one CA certificate store is required.\n"
msgstr ""
-#: src/qt-console/main.cpp:237
+#: src/qt-console/main.cpp:236
#, c-format
msgid ""
"No Director resource defined in %s\n"
"Without that I don't how to speak to the Director :-(\n"
msgstr ""
-#: src/qt-console/main.cpp:258
+#: src/qt-console/main.cpp:257
#, c-format
msgid ""
"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
"Console \"%s\" in %s.\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:79
+#: src/qt-console/tray-monitor/authenticate.cpp:78
msgid ""
"Director authorization problem.\n"
"Most likely the passwords do not agree.\n"
"For help, please see "
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:88
+#: src/qt-console/tray-monitor/authenticate.cpp:87
#, c-format
msgid "Bad response to Hello command: ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:95
+#: src/qt-console/tray-monitor/authenticate.cpp:94
msgid "Director rejected Hello command\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:123
+#: src/qt-console/tray-monitor/authenticate.cpp:122
#, c-format
msgid "Error sending Hello to Storage daemon. ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:129
+#: src/qt-console/tray-monitor/authenticate.cpp:128
msgid ""
"Director and Storage daemon passwords or names not the same.\n"
"For help, please see "
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:136
+#: src/qt-console/tray-monitor/authenticate.cpp:135
#, c-format
msgid "bdird<stored: bad response to Hello command: ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:143
+#: src/qt-console/tray-monitor/authenticate.cpp:142
msgid "Storage daemon rejected Hello command\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:169
+#: src/qt-console/tray-monitor/authenticate.cpp:168
#, c-format
msgid "Error sending Hello to File daemon. ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:175
+#: src/qt-console/tray-monitor/authenticate.cpp:174
msgid ""
"Director and File daemon passwords or names not the same.\n"
"For help, please see "
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:182
+#: src/qt-console/tray-monitor/authenticate.cpp:181
#, c-format
msgid "Bad response from File daemon to Hello command: ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:189
+#: src/qt-console/tray-monitor/authenticate.cpp:188
msgid "File daemon rejected Hello command\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:59
+#: src/qt-console/tray-monitor/tray-monitor.cpp:58
#, fuzzy, c-format
msgid ""
"\n"
@@ -380,14 +380,14 @@ msgstr ""
" -? geef deze melding.\n"
"\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:210
+#: src/qt-console/tray-monitor/tray-monitor.cpp:209
#, c-format
msgid ""
"Error: %d Monitor resources defined in %s. You must define one and only one "
"Monitor resource.\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:242
+#: src/qt-console/tray-monitor/tray-monitor.cpp:241
#, c-format
msgid ""
"No Client, Storage or Director resource defined in %s\n"
@@ -395,7 +395,7 @@ msgid ""
"Daemon :-(\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:257
+#: src/qt-console/tray-monitor/tray-monitor.cpp:256
#, c-format
msgid ""
"Invalid refresh interval defined in %s\n"
@@ -403,106 +403,106 @@ msgid ""
"minutes (read value: %d).\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:325
+#: src/qt-console/tray-monitor/tray-monitor.cpp:324
#, c-format
msgid "Error, currentitem is not a Client or a Storage..\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:363
+#: src/qt-console/tray-monitor/tray-monitor.cpp:362
#, c-format
msgid "Connecting to Client %s:%d"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:368
+#: src/qt-console/tray-monitor/tray-monitor.cpp:367
msgid "File daemon"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:373
+#: src/qt-console/tray-monitor/tray-monitor.cpp:372
#, c-format
msgid "Connecting to Storage %s:%d"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:378
+#: src/qt-console/tray-monitor/tray-monitor.cpp:377
msgid "Storage daemon"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:382
-#: src/qt-console/tray-monitor/tray-monitor.cpp:412
+#: src/qt-console/tray-monitor/tray-monitor.cpp:381
+#: src/qt-console/tray-monitor/tray-monitor.cpp:411
#, c-format
msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:387
+#: src/qt-console/tray-monitor/tray-monitor.cpp:386
msgid "Cannot connect to daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:396
+#: src/qt-console/tray-monitor/tray-monitor.cpp:395
#, c-format
msgid "Authentication error : %s"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:403
+#: src/qt-console/tray-monitor/tray-monitor.cpp:402
msgid "Opened connection with Director daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:406
+#: src/qt-console/tray-monitor/tray-monitor.cpp:405
msgid "Opened connection with File daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:409
+#: src/qt-console/tray-monitor/tray-monitor.cpp:408
msgid "Opened connection with Storage daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:460
+#: src/qt-console/tray-monitor/tray-monitor.cpp:459
msgid "Error : BNET_HARDEOF or BNET_ERROR"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:469
+#: src/qt-console/tray-monitor/tray-monitor.cpp:468
msgid "Error : Connection closed."
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:160
+#: src/qt-console/tray-monitor/tray_conf.cpp:159
#, c-format
msgid "No %s resource defined\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:169
+#: src/qt-console/tray-monitor/tray_conf.cpp:168
#, c-format
msgid "Monitor: name=%s FDtimeout=%s SDtimeout=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:175
+#: src/qt-console/tray-monitor/tray_conf.cpp:174
#, c-format
msgid "Director: name=%s address=%s FDport=%d\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:179
+#: src/qt-console/tray-monitor/tray_conf.cpp:178
#, c-format
msgid "Client: name=%s address=%s FDport=%d\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:183
+#: src/qt-console/tray-monitor/tray_conf.cpp:182
#, c-format
msgid "Storage: name=%s address=%s SDport=%d\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:191
+#: src/qt-console/tray-monitor/tray_conf.cpp:190
#, c-format
msgid "Unknown resource type %d in dump_resource.\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:249
+#: src/qt-console/tray-monitor/tray_conf.cpp:248
#, c-format
msgid "Unknown resource type %d in free_resource.\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:286
+#: src/qt-console/tray-monitor/tray_conf.cpp:285
#, c-format
msgid "Too many items in %s resource\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:306
-#: src/qt-console/tray-monitor/tray_conf.cpp:344
+#: src/qt-console/tray-monitor/tray_conf.cpp:305
+#: src/qt-console/tray-monitor/tray_conf.cpp:343
#, c-format
msgid "Unknown resource type %d in save_resource.\n"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 1d22335..4d9c036 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,6 +1,6 @@
# bacula translations
# Copyright (C) 2010 Inteos Sp. z o.o.
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
# License: BSD 2-Clause; see file LICENSE-FOSS
#
# Translated by Inteos Translation Team: pl at inteos.pl
@@ -17,96 +17,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/wx-console/authenticate.c:127 src/dird/authenticate.c:127
-#: src/console/authenticate.c:125
-msgid ""
-"Authorization problem: Remote server did not advertise required TLS "
-"support.\n"
-msgstr ""
-"Problem autoryzacji: Zdalny serwer nie zadeklarował wymaganego wsparcia dla "
-"TLS.\n"
-
-#: src/wx-console/authenticate.c:133 src/filed/authenticate.c:159
-#: src/filed/authenticate.c:278 src/dird/authenticate.c:134
-#: src/console/authenticate.c:132 src/stored/authenticate.c:147
-#: src/stored/authenticate.c:258
-msgid "Authorization problem: Remote server requires TLS.\n"
-msgstr "Problem autoryzacji: Zdalny serwer wymaga TLS.\n"
-
-#: src/wx-console/authenticate.c:142 src/console/authenticate.c:141
-msgid "TLS negotiation failed\n"
-msgstr "Negocjacja TLS nie powiodła się\n"
-
-#: src/wx-console/authenticate.c:150
-msgid "Bad response to Hello command: ERR="
-msgstr "Zła odpowiedź na komend Hello: ERR="
-
-#: src/wx-console/authenticate.c:157 src/tray-monitor/authenticate.c:104
-#: src/console/authenticate.c:162
-msgid "Director rejected Hello command\n"
-msgstr "Director odrzucił komendę Hello\n"
-
-#: src/wx-console/authenticate.c:167 src/console/authenticate.c:172
-msgid ""
-"Director authorization problem.\n"
-"Most likely the passwords do not agree.\n"
-"If you are using TLS, there may have been a certificate validation error "
-"during the TLS handshake.\n"
-"Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi."
-"html#SECTION003760000000000000000 for help.\n"
-msgstr ""
-"Problem autoryzacji Director'a.\n"
-"Najprawdopodobniej się nie zgadzają się hasła.\n"
-"Jeżeli używasz TLS, może to być także błąd weryfikacji certyfikatu podczas "
-"negocjacji TLS.\n"
-"Zobacz http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi."
-"html#SECTION003760000000000000000 w celu uzyskania pomocy.\n"
-
-#: src/wx-console/console_conf.c:147 src/console/console_conf.c:140
-#: src/qt-console/bat_conf.cpp:141
-#, c-format
-msgid "No record for %d %s\n"
-msgstr "Brak rekordu dla %d %s\n"
-
-#: src/wx-console/console_conf.c:156 src/console/console_conf.c:149
-#, c-format
-msgid "Console: name=%s rcfile=%s histfile=%s\n"
-msgstr "Konsola: nazwa=%s plikrc=%s plikhist=%s\n"
-
-#: src/wx-console/console_conf.c:160 src/console/console_conf.c:153
-#: src/qt-console/bat_conf.cpp:150
-#, c-format
-msgid "Director: name=%s address=%s DIRport=%d\n"
-msgstr "Director: nazwa=%s adres=%s DIRport=%d\n"
-
-#: src/wx-console/console_conf.c:164 src/wx-console/console_conf.c:239
-#: src/wx-console/console_conf.c:284 src/wx-console/console_conf.c:311
-#: src/filed/filed_conf.c:333 src/filed/filed_conf.c:398
-#: src/filed/filed_conf.c:428 src/console/console_conf.c:157
-#: src/console/console_conf.c:233 src/console/console_conf.c:278
-#: src/console/console_conf.c:305 src/stored/stored_conf.c:551
-#: src/stored/stored_conf.c:639 src/stored/stored_conf.c:674
-#: src/qt-console/bat_conf.cpp:161 src/qt-console/bat_conf.cpp:239
-#: src/qt-console/bat_conf.cpp:287 src/qt-console/bat_conf.cpp:317
-#, c-format
-msgid "Unknown resource type %d\n"
-msgstr "Nieznany rodzaj zasobu %d\n"
-
-#: src/wx-console/console_conf.c:265 src/filed/filed_conf.c:361
-#: src/tray-monitor/tray_conf.c:288 src/dird/dird_conf.c:1371
-#: src/dird/dird_conf.c:1386 src/console/console_conf.c:259
-#: src/qt-console/bat_conf.cpp:265
-#, c-format
-msgid "%s item is required in %s resource, but not found.\n"
-msgstr "Element %s jest wymagany w zasobie %s, lecz nie został znaleziony.\n"
-
-#: src/wx-console/console_conf.c:328 src/filed/filed_conf.c:446
-#: src/tray-monitor/tray_conf.c:372 src/dird/dird_conf.c:1609
-#: src/console/console_conf.c:322 src/qt-console/bat_conf.cpp:334
-#, c-format
-msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
-msgstr "Próba definicji kolejnego zasobu %s nazwanego \"%s\" nie jest dozwolona.\n"
-
#: src/filed/backup.c:100
msgid "Cannot set buffer size FD->SD.\n"
msgstr "Nie można ustawić wielkości bufora FD->SD.\n"
@@ -17518,797 +17428,6 @@ msgstr ""
"\n"
"BŁĄD Bacula: "
-#: src/wx-console/wxbmainframe.cpp:246
-msgid "&About...\tF1"
-msgstr "&About...\tF1"
-
-#: src/wx-console/wxbmainframe.cpp:246
-msgid "Show about dialog"
-msgstr "Pokaż dialog o"
-
-#: src/wx-console/wxbmainframe.cpp:248 src/wx-console/wxbmainframe.cpp:619
-msgid "Connect"
-msgstr "Połącz"
-
-#: src/wx-console/wxbmainframe.cpp:248 src/wx-console/wxbmainframe.cpp:620
-msgid "Connect to the director"
-msgstr "Połącz do Dyrektora"
-
-#: src/wx-console/wxbmainframe.cpp:249
-msgid "Disconnect"
-msgstr "Rozłącz"
-
-#: src/wx-console/wxbmainframe.cpp:249
-msgid "Disconnect of the director"
-msgstr "Rozłączanie dyrektora"
-
-#: src/wx-console/wxbmainframe.cpp:251
-msgid "Change of configuration file"
-msgstr "Zmiana pliku konfiguracyjnego"
-
-#: src/wx-console/wxbmainframe.cpp:251
-msgid "Change your default configuration file"
-msgstr "Zmień swój domyślny plik konfiguracyjny"
-
-#: src/wx-console/wxbmainframe.cpp:252
-msgid "Edit your configuration file"
-msgstr "Wyedytuj swój plik konfiguracyjny"
-
-#: src/wx-console/wxbmainframe.cpp:254
-msgid "E&xit\tAlt-X"
-msgstr "&Wyjście\tAlt-X"
-
-#: src/wx-console/wxbmainframe.cpp:254
-msgid "Quit this program"
-msgstr "Zamknij ten program"
-
-#: src/wx-console/wxbmainframe.cpp:258
-msgid "&File"
-msgstr "&Pliki"
-
-#: src/wx-console/wxbmainframe.cpp:259
-msgid "&Help"
-msgstr "&Pomoc"
-
-#: src/wx-console/wxbmainframe.cpp:267 src/wx-console/main.cpp:124
-#, c-format
-msgid "Welcome to bacula bwx-console %s (%s)!\n"
-msgstr "Witamy w konsoli baculi bwx-console %s (%s)!\n"
-
-#: src/wx-console/wxbmainframe.cpp:283
-msgid ""
-"Warning : Unicode is disabled because you are using wxWidgets for GTK+ 1.2.\n"
-msgstr ""
-"Ostrzeżenie : Unicode jest wyłączony ponieważ używane jest wxWidgets dla GTK+ 1.2.\n"
-
-#: src/wx-console/wxbmainframe.cpp:287
-msgid ""
-"Warning : There is a problem with wxWidgets for GTK+ 2.0 without Unicode "
-"support when handling non-ASCII filenames: Every non-ASCII character in such "
-"filenames will be replaced by an interrogation mark.\n"
-"If this behaviour disturbs you, please build bwx-console against a Unicode "
-"version of wxWidgets for GTK+ 2.0.\n"
-"---\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:291
-#: src/wx-console/wxbhistorytextctrl.cpp:82
-#: src/wx-console/wxbhistorytextctrl.cpp:153
-msgid "Type your command below:"
-msgstr "Napisz swoje polecenie poniżej:"
-
-#: src/wx-console/wxbmainframe.cpp:298
-msgid "Send"
-msgstr "Wysłano"
-
-#: src/wx-console/wxbmainframe.cpp:375 src/wx-console/wxbmainframe.cpp:387
-msgid "Error while parsing command line arguments, using defaults.\n"
-msgstr "Błąd podczas parsowania argumentów lini komend, używam domyślnych.\n"
-
-#: src/wx-console/wxbmainframe.cpp:376 src/wx-console/wxbmainframe.cpp:388
-msgid "Usage: bwx-console [-c configfile] [-w tmp]\n"
-msgstr "Użycie: bwx-console [-c configfile] [-w tmp]\n"
-
-#: src/wx-console/wxbmainframe.cpp:417
-#, c-format
-msgid ""
-"It seems that it is the first time you run bwx-console.\n"
-"This file (%s) has been choosen as default configuration file.\n"
-"Do you want to edit it? (if you click No you will have to select another "
-"file)"
-msgstr ""
-"wydaje się że to twoje pierwsze uruchomienie konsoli bwx.\n"
-"Ten plik (%s) został wybrany jako domyślny plik konfiguracyjny.\n"
-"Czy chcesz go edytować? (jeśli wybierzesz 'No' będziesz musiał wybrać inny "
-"plik)"
-
-#: src/wx-console/wxbmainframe.cpp:419
-msgid "First run"
-msgstr "Pierwsze uruchomienie"
-
-#: src/wx-console/wxbmainframe.cpp:436
-#, c-format
-msgid ""
-"Unable to read %s\n"
-"Error: %s\n"
-"Do you want to choose another one? (Press no to edit this file)"
-msgstr ""
-"Nie można odczytać %s\n"
-"Błąd: %s\n"
-"Czy chcesz wybrać inny? (Wybierz 'no' by edytowac ten plik)"
-
-#: src/wx-console/wxbmainframe.cpp:438
-msgid "Unable to read configuration file"
-msgstr "Nie można odczytać pliku konfiguracyjnego"
-
-#: src/wx-console/wxbmainframe.cpp:450
-msgid "Please choose a configuration file to use"
-msgstr "Proszę wybierz używany plik konfiguracyjny"
-
-#: src/wx-console/wxbmainframe.cpp:463
-msgid "This configuration file has been successfully read, use it as default?"
-msgstr "Ten plik konfiguracyjny został z powodzeniem odczytany, czy użyć go jako domyślny?"
-
-#: src/wx-console/wxbmainframe.cpp:464
-msgid "Configuration file read successfully"
-msgstr "Plik konfiguracyjny odczytany z powodzeniem"
-
-#: src/wx-console/wxbmainframe.cpp:474
-msgid "Using this configuration file: %s\n"
-msgstr "Użyj tego pliku konfiguracyjnego: %s\n"
-
-#: src/wx-console/wxbmainframe.cpp:479
-msgid "Connecting to the director..."
-msgstr "Podłączenie do dyrektora..."
-
-#: src/wx-console/wxbmainframe.cpp:494
-msgid "Failed to unregister a data parser !"
-msgstr "Niepowodzenie przy wyrejestrowaniu parsera danych!"
-
-#: src/wx-console/wxbmainframe.cpp:502
-msgid "Quitting.\n"
-msgstr "Wychodzenie.\n"
-
-#: src/wx-console/wxbmainframe.cpp:517
-msgid ""
-"Welcome to Bacula bwx-console.\n"
-"Written by Nicolas Boichat <nicolas at boichat.ch>\n"
-"Copyright (C), 2005-2007 Free Software Foundation Europe, e.V.\n"
-msgstr ""
-"Witamy w Bacula bwx-console.\n"
-"Napisane przez Nicolas Boichat <nicolas at boichat.ch>\n"
-"Copyright (C), 2005-2007 Free Software Foundation Europe, e.V.\n"
-
-#: src/wx-console/wxbmainframe.cpp:521
-msgid "About Bacula bwx-console"
-msgstr "O Bacula bwx-console"
-
-#: src/wx-console/wxbmainframe.cpp:527
-msgid "Please choose your default configuration file"
-msgstr "Proszę wybierz swój plik konfiguracyjny"
-
-#: src/wx-console/wxbmainframe.cpp:531
-msgid "Use this configuration file as default?"
-msgstr "Użyć tego pliku konfiguracyjnego jako domyślnego?"
-
-#: src/wx-console/wxbmainframe.cpp:532
-msgid "Configuration file"
-msgstr "Plik konfiguracyjny"
-
-#: src/wx-console/wxbmainframe.cpp:603
-msgid "Console thread terminated."
-msgstr "Zakończono wątek konsoli."
-
-#: src/wx-console/wxbmainframe.cpp:611
-msgid "Connection to the director lost. Quit program?"
-msgstr "Podłączenie do dyrektora utracone. Zkończyć program?"
-
-#: src/wx-console/wxbmainframe.cpp:612
-msgid "Connection lost"
-msgstr "Połączenie utracone."
-
-#: src/wx-console/wxbmainframe.cpp:628
-msgid "Connected to the director."
-msgstr "Podłączony do dyrektora."
-
-#: src/wx-console/wxbmainframe.cpp:651
-#, fuzzy
-msgid "Reconnect"
-msgstr "Utworzone"
-
-#: src/wx-console/wxbmainframe.cpp:652
-#, fuzzy
-msgid "Reconnect to the director"
-msgstr "Podłączenie do Dyrektora %s:%d"
-
-#: src/wx-console/wxbmainframe.cpp:666
-msgid "Disconnected of the director."
-msgstr "Rozłączanie dyrektora."
-
-#: src/wx-console/wxbmainframe.cpp:685 src/wx-console/wxbrestorepanel.cpp:720
-msgid "Unexpected question has been received.\n"
-msgstr "Otrzymano nieoczekiwane pytanie.\n"
-
-#: src/wx-console/wxbmainframe.cpp:708 src/wx-console/wxbmainframe.cpp:725
-msgid "bwx-console: unexpected director's question."
-msgstr "bwx-console: nieoczekiwane zapytanie Dyrektora."
-
-#: src/wx-console/wxbconfigpanel.cpp:213
-msgid "Apply"
-msgstr "Zastosuj"
-
-#: src/wx-console/console_thread.cpp:125
-msgid ""
-"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
-"Director \"%s\" in config file.\n"
-"At least one CA certificate store is required.\n"
-msgstr ""
-"Ani \"TLS CA Certificate\", ani \"TLS CA Certificate Dir\" nie są "
-"zdefiniowane dla Dyrektora \"%s\" w pliku konfiguracyjnym.\n"
-" Co najmniej jedno skadowanie certyfikatu CA jest wymagane.\n"
-
-#: src/wx-console/console_thread.cpp:132
-msgid ""
-"No Director resource defined in config file.\n"
-"Without that I don't how to speak to the Director :-(\n"
-msgstr ""
-"Brak definicji zasobu Dyrektora w pliku konfiguracyjnym\n"
-"Bez tego nie wiem jak rozmawiać z Dyrektorem :-(\n"
-
-#: src/wx-console/console_thread.cpp:151
-msgid ""
-"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
-"Console \"%s\" in config file.\n"
-msgstr ""
-"Ani \"TLS CA Certificate\", ani \"TLS CA Certificate Dir\" nie zostały "
-"zdefiniowane dla Konsoli \"%s\" w pliku konfiguracyjnym.\n"
-
-#: src/wx-console/console_thread.cpp:173
-msgid "Error while initializing windows sockets...\n"
-msgstr "Błąd w trakcie inicjalizacji gniazd windows...\n"
-
-#: src/wx-console/console_thread.cpp:189
-msgid "Error while cleaning up windows sockets...\n"
-msgstr "Błąd w trakcie czyszczenia gniazd windows...\n"
-
-#: src/wx-console/console_thread.cpp:228
-msgid "Error while initializing library."
-msgstr "Błąd w trakcie inicjalizacji biblioteki."
-
-#: src/wx-console/console_thread.cpp:256
-msgid "Cryptographic library initialization failed.\n"
-msgstr "Nieudana inicjalizacja biblioteki kryptograficznej.\n"
-
-#: src/wx-console/console_thread.cpp:260
-msgid "Please correct configuration file.\n"
-msgstr "Proszę popraw plik konfiguracyjny.\n"
-
-#: src/wx-console/console_thread.cpp:302
-msgid "Error : Library not initialized\n"
-msgstr "Błąd : Nie zainicjalizowana biblioteka\n"
-
-#: src/wx-console/console_thread.cpp:313
-msgid "Error : No configuration file loaded\n"
-msgstr "Błąd : Nie załadowano pliku konfiguracyjnego\n"
-
-#: src/wx-console/console_thread.cpp:323
-msgid "Connecting...\n"
-msgstr "Łączenie...\n"
-
-#: src/wx-console/console_thread.cpp:339
-msgid "Error : No director defined in config file.\n"
-msgstr "Błąd : Brak definicji dyrektora w pliku konfiguracyjnym.\n"
-
-#: src/wx-console/console_thread.cpp:351
-msgid "Multiple directors found in your config file.\n"
-msgstr "Znaleziono wielu dyrektorów w twoim pliku konfiguracyjnym.\n"
-
-#: src/wx-console/console_thread.cpp:360
-#, c-format
-msgid "Please choose a director (1-%d): "
-msgstr "Proszę wybierz dyrektora (1-%d): "
-
-#: src/wx-console/console_thread.cpp:389
-#, c-format
-msgid "Passphrase for Console \"%s\" TLS private key: "
-msgstr "Hasło dla klucza prywatnego TLS Konsoli \"%s\": "
-
-#: src/wx-console/console_thread.cpp:410
-#, c-format
-msgid "Passphrase for Director \"%s\" TLS private key: "
-msgstr "Hasło dla klucza prywatnego TLS Dyrektora \"%s\": "
-
-#: src/wx-console/console_thread.cpp:432
-msgid "Failed to connect to the director\n"
-msgstr "Nieudane podłączenie do dyrektora\n"
-
-#: src/wx-console/console_thread.cpp:442
-msgid "Connected\n"
-msgstr "Podłączony\n"
-
-#: src/wx-console/console_thread.cpp:499
-msgid "<< Unexpected signal received : "
-msgstr "<< Otrzymano nieoczekiwany sygnał : "
-
-#: src/wx-console/console_thread.cpp:519
-msgid "Connection terminated\n"
-msgstr "Podłączenie zakończone\n"
-
-#: src/wx-console/wxbconfigfileeditor.cpp:65
-msgid "Config file editor"
-msgstr "Edytor pliku konfiguracyjnego"
-
-#: src/wx-console/wxbconfigfileeditor.cpp:75
-msgid "# Bacula bwx-console Configuration File\n"
-msgstr "# Plik Konfiguracyjny Bacula bwx-console\n"
-
-#: src/wx-console/wxbconfigfileeditor.cpp:111
-msgid "Save and close"
-msgstr "Zapisz i zamknij"
-
-#: src/wx-console/wxbconfigfileeditor.cpp:112
-msgid "Close without saving"
-msgstr "Zamknij bez zapisywania"
-
-#: src/wx-console/wxbconfigfileeditor.cpp:139
-msgid "Unable to write to %s\n"
-msgstr "Nie mogę pisać do %s\n"
-
-#: src/wx-console/wxbconfigfileeditor.cpp:140
-msgid "Error while saving"
-msgstr "Błąd w trakcie zapisywania"
-
-#: src/wx-console/main.cpp:119
-msgid "Bacula bwx-console"
-msgstr "Bacula bwx-console"
-
-#: src/wx-console/wxbrestorepanel.cpp:234
-#: src/wx-console/wxbrestorepanel.cpp:1947
-#: src/wx-console/wxbrestorepanel.cpp:1976
-msgid "Enter restore mode"
-msgstr "Wprowadź tryb odtwarzania"
-
-#: src/wx-console/wxbrestorepanel.cpp:237
-msgid "Cancel restore"
-msgstr "Anuluj odtwarzanie"
-
-#: src/wx-console/wxbrestorepanel.cpp:263
-#: src/wx-console/wxbrestorepanel.cpp:317
-msgid "Add"
-msgstr "Dodaj"
-
-#: src/wx-console/wxbrestorepanel.cpp:265
-#: src/wx-console/wxbrestorepanel.cpp:319
-msgid "Remove"
-msgstr "Usuń"
-
-#: src/wx-console/wxbrestorepanel.cpp:267
-#: src/wx-console/wxbrestorepanel.cpp:321
-msgid "Refresh"
-msgstr "Odwierz"
-
-#: src/wx-console/wxbrestorepanel.cpp:286
-msgid "M"
-msgstr "M"
-
-#: src/wx-console/wxbrestorepanel.cpp:290
-msgid "Filename"
-msgstr "Nazwa pliku"
-
-#: src/wx-console/wxbrestorepanel.cpp:294
-msgid "Size"
-msgstr "Rozmiar"
-
-#: src/wx-console/wxbrestorepanel.cpp:298
-msgid "Date"
-msgstr "Data"
-
-#: src/wx-console/wxbrestorepanel.cpp:302
-msgid "Perm."
-msgstr "Prawa"
-
-#: src/wx-console/wxbrestorepanel.cpp:306
-msgid "User"
-msgstr "Użytkownik"
-
-#: src/wx-console/wxbrestorepanel.cpp:310
-msgid "Group"
-msgstr "Grupa"
-
-#: src/wx-console/wxbrestorepanel.cpp:335
-#: src/wx-console/wxbrestorepanel.cpp:348
-#: src/wx-console/wxbrestorepanel.cpp:503
-#: src/wx-console/wxbrestorepanel.cpp:513
-#: src/wx-console/wxbrestorepanel.cpp:516
-#: src/wx-console/wxbrestorepanel.cpp:1811
-#: src/wx-console/wxbrestorepanel.cpp:1897
-msgid "Job Name"
-msgstr "Nazwa Zadania"
-
-#: src/wx-console/wxbrestorepanel.cpp:337
-#: src/wx-console/wxbrestorepanel.cpp:353
-#: src/wx-console/wxbrestorepanel.cpp:455
-#: src/wx-console/wxbrestorepanel.cpp:456
-#: src/wx-console/wxbrestorepanel.cpp:466
-#: src/wx-console/wxbrestorepanel.cpp:467
-#: src/wx-console/wxbrestorepanel.cpp:1153
-#: src/wx-console/wxbrestorepanel.cpp:1156
-#: src/wx-console/wxbrestorepanel.cpp:1239
-#: src/wx-console/wxbrestorepanel.cpp:1849
-#: src/wx-console/wxbrestorepanel.cpp:1851
-#: src/wx-console/wxbrestorepanel.cpp:1912
-msgid "Fileset"
-msgstr "Zestaw plików"
-
-#: src/wx-console/wxbrestorepanel.cpp:340
-#: src/wx-console/wxbrestorepanel.cpp:1233
-#: src/wx-console/wxbrestorepanel.cpp:1249
-#: src/wx-console/wxbrestorepanel.cpp:1251
-#: src/wx-console/wxbrestorepanel.cpp:1259
-#: src/wx-console/wxbrestorepanel.cpp:1261
-#: src/wx-console/wxbrestorepanel.cpp:1280
-#: src/wx-console/wxbrestorepanel.cpp:1287
-#: src/wx-console/wxbrestorepanel.cpp:1839
-#: src/wx-console/wxbrestorepanel.cpp:1850
-#: src/wx-console/wxbrestorepanel.cpp:1971
-msgid "Before"
-msgstr "Przed"
-
-#: src/wx-console/wxbrestorepanel.cpp:342
-msgid "Please configure parameters concerning files to restore :"
-msgstr "Proszę skonfiguruj parametry związane z plikami do odtwarzania :"
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-#: src/wx-console/wxbrestorepanel.cpp:1905
-msgid "always"
-msgstr "zawsze"
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-msgid "if newer"
-msgstr "jeśli nowszy"
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-msgid "if older"
-msgstr "jeśli starszy"
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-#: src/wx-console/wxbrestorepanel.cpp:1908
-msgid "never"
-msgstr "nigdy"
-
-#: src/wx-console/wxbrestorepanel.cpp:359
-msgid "Please configure parameters concerning files restoration :"
-msgstr "Proszę skonfigurować parametry dotyczących odtwarzania plików :"
-
-#: src/wx-console/wxbrestorepanel.cpp:427
-msgid "Getting parameters list."
-msgstr "Pobieranie listy parametrów."
-
-#: src/wx-console/wxbrestorepanel.cpp:435
-msgid "Error : no clients returned by the director."
-msgstr "Błąd : dyrektor nie zwrócił klientów."
-
-#: src/wx-console/wxbrestorepanel.cpp:459
-msgid "Error : no filesets returned by the director."
-msgstr "Błąd : dyrektor nie zwrócił żadnych fileset'ów."
-
-#: src/wx-console/wxbrestorepanel.cpp:483
-msgid "Error : no storage returned by the director."
-msgstr "Błąd : dyrektor nie zwrócił storage."
-
-#: src/wx-console/wxbrestorepanel.cpp:506
-#: src/wx-console/wxbrestorepanel.cpp:530
-msgid "Error : no jobs returned by the director."
-msgstr "Błąd : dyrektor nie zwrócił zadań."
-
-#: src/wx-console/wxbrestorepanel.cpp:516
-msgid "RestoreFiles"
-msgstr "RestoreFiles"
-
-#: src/wx-console/wxbrestorepanel.cpp:551
-msgid "Please configure your restore parameters."
-msgstr "Proszę skonfiguruj swoje parametry odtwarzania."
-
-#: src/wx-console/wxbrestorepanel.cpp:556
-msgid "Please select a client."
-msgstr "Proszę zaznacz klienta."
-
-#: src/wx-console/wxbrestorepanel.cpp:560
-msgid "Please select a restore date."
-msgstr "Proszę wskaż datę odtwarzania."
-
-#: src/wx-console/wxbrestorepanel.cpp:565
-msgid "Building restore tree..."
-msgstr "Budowanie drzewa odtwarzania..."
-
-#: src/wx-console/wxbrestorepanel.cpp:613
-msgid "Error while starting restore: "
-msgstr "Błąd w trakcie uruchamiania odtwarzania: "
-
-#: src/wx-console/wxbrestorepanel.cpp:705
-msgid ""
-"Right click on a file or on a directory, or double-click on its mark to add "
-"it to the restore list."
-msgstr ""
-"Kliknięcie prawym przyciskiem myszy na pliku lub katalogu, lub podwójne "
-"kliknięcie na nich zaznacza je i dodaje do listy odtwarzania."
-
-#: src/wx-console/wxbrestorepanel.cpp:742
-#: src/wx-console/wxbrestorepanel.cpp:764
-msgid "bwx-console: unexpected restore question."
-msgstr "bwx-console: niespodziewane pytanie o odtwarzanie."
-
-#: src/wx-console/wxbrestorepanel.cpp:775
-msgid " files selected to be restored."
-msgstr " pliki zaznaczone do odtworzenia."
-
-#: src/wx-console/wxbrestorepanel.cpp:780
-msgid " file selected to be restored."
-msgstr " plik zaznaczony do odtworzenia."
-
-#: src/wx-console/wxbrestorepanel.cpp:787
-#, c-format
-msgid "Please configure your restore (%ld files selected to be restored)..."
-msgstr ""
-"Proszę skonfiguruj swoje odtwarzanie (%ld plików zaznaczonych do "
-"odtwarzania)..."
-
-#: src/wx-console/wxbrestorepanel.cpp:797
-msgid "Restore failed : no file selected.\n"
-msgstr "Nieudane odtwarzanie, nie wskazano pliku.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:798
-msgid "Restore failed : no file selected."
-msgstr "Nieudane odtwarzanie, nie wskazano pliku."
-
-#: src/wx-console/wxbrestorepanel.cpp:808
-msgid "Restoring, please wait..."
-msgstr "Odtwarzanie, proszę czekać..."
-
-#: src/wx-console/wxbrestorepanel.cpp:821
-msgid "Job queued. JobId="
-msgstr "Zadanie zakolejkowane. JobId="
-
-#: src/wx-console/wxbrestorepanel.cpp:823
-msgid "Restore queued, jobid="
-msgstr "Odtwarzanie zakolejkowane, jobid="
-
-#: src/wx-console/wxbrestorepanel.cpp:827
-msgid "Job failed."
-msgstr "Zadanie nieudane."
-
-#: src/wx-console/wxbrestorepanel.cpp:828
-msgid "Restore failed, please look at messages.\n"
-msgstr "Nieudane odtwarzanie, proszę zweryfikuj komunikaty.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:829
-msgid "Restore failed, please look at messages in console."
-msgstr "Odtwarzanie nieudane, proszę spojrzeć na komunikaty na konsoli."
-
-#: src/wx-console/wxbrestorepanel.cpp:835
-#: src/wx-console/wxbrestorepanel.cpp:836
-msgid "Failed to retrieve jobid.\n"
-msgstr "Nieudane pobranie jobid.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:862
-msgid ""
-"Restore is scheduled to run. bwx-console will not wait for its completion.\n"
-msgstr ""
-"Zadanie odtwarzania zaplanowane do uruchomienia. bwx-console nie będzie "
-"czekać na jego zakończenie.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:863
-msgid ""
-"Restore is scheduled to run. bwx-console will not wait for its completion."
-msgstr ""
-"Zadanie odtwarzania zaplanowane do uruchomienia. bwx-console nie będzie "
-"czekać na jego zakończenie."
-
-#: src/wx-console/wxbrestorepanel.cpp:889
-msgid "Restore job created, but not yet running."
-msgstr "Zadanie odtwarzania stworzone, lecz jeszcze nie uruchomione."
-
-#: src/wx-console/wxbrestorepanel.cpp:894
-msgid "Restore job running, please wait (%ld of %ld files restored)..."
-msgstr "Zadanie odtwarzania w trakcie, proszę czekać (%ld z %ld plików odtworzonych)..."
-
-#: src/wx-console/wxbrestorepanel.cpp:898
-msgid "Restore job terminated successfully."
-msgstr "Zadanie odtwarzania zakończone poprawnie."
-
-#: src/wx-console/wxbrestorepanel.cpp:899
-msgid "Restore job terminated successfully.\n"
-msgstr "Zadanie odtwarzania zakończone poprawnie.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:904
-msgid "Restore job terminated in error, see messages in console."
-msgstr "Zadanie odtwarzania zakończone z błędem, zobacz komunikaty na konsoli."
-
-#: src/wx-console/wxbrestorepanel.cpp:905
-msgid "Restore job terminated in error, see messages.\n"
-msgstr "Zadanie odtwarzania zakończone z błędem, zobacz komunikaty.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:910
-msgid "Restore job reported a non-fatal error."
-msgstr "Zadanie odtwarzania zaraportowało niekrytyczny błąd."
-
-#: src/wx-console/wxbrestorepanel.cpp:914
-msgid "Restore job reported a fatal error."
-msgstr "Zadanie odtwarzania zaraportowało błąd krytyczny."
-
-#: src/wx-console/wxbrestorepanel.cpp:919
-msgid "Restore job cancelled by user."
-msgstr "Zadanie odtwarzania anulowane przez użytkownika."
-
-#: src/wx-console/wxbrestorepanel.cpp:920
-msgid "Restore job cancelled by user.\n"
-msgstr "Zadanie odtwarzania anulowane przez użytkownika.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:925
-msgid "Restore job is waiting on File daemon."
-msgstr "Zadanie odtwarzania oczekuje na Demon Plików."
-
-#: src/wx-console/wxbrestorepanel.cpp:929
-msgid "Restore job is waiting for new media."
-msgstr "Zadanie odtwarzania oczekuje na nowe medium."
-
-#: src/wx-console/wxbrestorepanel.cpp:933
-msgid "Restore job is waiting for storage resource."
-msgstr "Zadanie odtwarzania oczekuje na zasoby storage."
-
-#: src/wx-console/wxbrestorepanel.cpp:937
-msgid "Restore job is waiting for job resource."
-msgstr "Zadanie odtwarzania oczekuje na zasoby dadania."
-
-#: src/wx-console/wxbrestorepanel.cpp:941
-msgid "Restore job is waiting for Client resource."
-msgstr "Zadanie odtwarzania oczekuje na zasoby Klienta."
-
-#: src/wx-console/wxbrestorepanel.cpp:945
-msgid "Restore job is waiting for maximum jobs."
-msgstr "Zadanie odtwarzania oczekuje z powodu maksymalnej iloiści zadań."
-
-#: src/wx-console/wxbrestorepanel.cpp:949
-msgid "Restore job is waiting for start time."
-msgstr "Zadanie odtwarzania oczekuje na czas uruchomienia."
-
-#: src/wx-console/wxbrestorepanel.cpp:953
-msgid "Restore job is waiting for higher priority jobs to finish."
-msgstr "Zadanie odtwarzania oczekuje na zakończenie zadań o wyższym priorytecie."
-
-#: src/wx-console/wxbrestorepanel.cpp:1002
-msgid ""
-"The restore job has not been started within one minute, bwx-console will not "
-"wait for its completion anymore.\n"
-msgstr ""
-"Zadanie odtwarzania nie wystartowało w ciągu minuty, bwx-console nie będzie "
-"już więcej czekać na jego zakończenie.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:1003
-msgid ""
-"The restore job has not been started within one minute, bwx-console will not "
-"wait for its completion anymore."
-msgstr ""
-"Zadanie odtwarzania nie wystartowało w ciągu minuty, bwx-console nie będzie "
-"już więcej czekać na jego zakończenie."
-
-#: src/wx-console/wxbrestorepanel.cpp:1013
-msgid "Restore done successfully.\n"
-msgstr "Odtwarzanie wykonane poprawnie.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:1014
-msgid "Restore done successfully."
-msgstr "Odtwarzanie wykonane poprawnie."
-
-#: src/wx-console/wxbrestorepanel.cpp:1086
-msgid "Applying restore configuration changes..."
-msgstr "Zastosowanie zmian konfiguracyjnych odtwarzania..."
-
-#: src/wx-console/wxbrestorepanel.cpp:1138
-msgid "Failed to find the selected client."
-msgstr "Nie można znaleźć wskazanego klienta."
-
-#: src/wx-console/wxbrestorepanel.cpp:1158
-msgid "Failed to find the selected fileset."
-msgstr "Nie można znaleźć wskazanego fileset."
-
-#: src/wx-console/wxbrestorepanel.cpp:1178
-msgid "Failed to find the selected storage."
-msgstr "Nie można znaleźć wskazanego storage."
-
-#: src/wx-console/wxbrestorepanel.cpp:1199
-#: src/wx-console/wxbrestorepanel.cpp:1886
-msgid "Run Restore job"
-msgstr "Uruchom zadanie Odtwarzania"
-
-#: src/wx-console/wxbrestorepanel.cpp:1216
-msgid "Restore configuration changes were applied."
-msgstr "Odtworzenie zmian konfiguracji zostało zastosowane."
-
-#: src/wx-console/wxbrestorepanel.cpp:1225
-msgid "Restore cancelled.\n"
-msgstr "Odtwarzanie anulowane.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:1226
-msgid "Restore cancelled."
-msgstr "Odtwarzanie anulowane."
-
-#: src/wx-console/wxbrestorepanel.cpp:1248
-msgid "No results to list."
-msgstr "Brak rezultatów do wylistowania."
-
-#: src/wx-console/wxbrestorepanel.cpp:1250
-msgid "No backup found for this client."
-msgstr "Nie znaleziono backupu dla tego klienta."
-
-#: src/wx-console/wxbrestorepanel.cpp:1257
-msgid "ERROR"
-msgstr "BŁĄD"
-
-#: src/wx-console/wxbrestorepanel.cpp:1258
-msgid "Query failed"
-msgstr "Nieudane zapytanie"
-
-#: src/wx-console/wxbrestorepanel.cpp:1260
-msgid "Cannot get previous backups list, see console."
-msgstr "Nie moąna otrzymać listy poprzednich backupów, zobacz konsolę."
-
-#: src/wx-console/wxbrestorepanel.cpp:1896
-msgid "JobName:"
-msgstr "Nazwa Zadania:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1898
-msgid "Bootstrap:"
-msgstr "Bootstrap:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1900
-msgid "Where:"
-msgstr "Gdzie:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1903
-msgid "Replace:"
-msgstr "Zamiana:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1906
-msgid "ifnewer"
-msgstr "ifnewer"
-
-#: src/wx-console/wxbrestorepanel.cpp:1907
-msgid "ifolder"
-msgstr "ifolder"
-
-#: src/wx-console/wxbrestorepanel.cpp:1911
-msgid "FileSet:"
-msgstr "FileSet:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1913
-msgid "Client:"
-msgstr "Klient:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1915
-msgid "Storage:"
-msgstr "Storage:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1917
-msgid "When:"
-msgstr "Kiedy:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1920
-msgid "Priority:"
-msgstr "Priorytet:"
-
-#: src/wx-console/wxbrestorepanel.cpp:2028
-msgid "Restoring..."
-msgstr "Odtwarzanie..."
-
-#: src/wx-console/wxbhistorytextctrl.cpp:117
-msgid "Unknown command."
-msgstr "Nieznana komenda."
-
-#: src/wx-console/wxbhistorytextctrl.cpp:126
-msgid "Possible completions: "
-msgstr "Możliwe uzupełnienia: "
-
#: src/qt-console/bat_conf.cpp:154
msgid "Console: name=%s\n"
msgstr "Konsola: nazwa=%s\n"
diff --git a/po/sv.po b/po/sv.po
index 0756cf3..7cd5283 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,12 +1,12 @@
# Swedish translations for PACKAGE package.
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
# License: BSD 2-Clause; see file LICENSE-FOSS
#
msgid ""
msgstr ""
"Project-Id-Version: Bacula 2.1.x\n"
"Report-Msgid-Bugs-To: bacula-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2015-08-09 15:05+0200\n"
+"POT-Creation-Date: 2016-01-10 15:13+0100\n"
"PO-Revision-Date: 2007-06-22 19:18+0200\n"
"Last-Translator: Kern Sibbald <kern at bacula.org>\n"
"Language-Team: Swedish <bacula-devel at lists.soureforge.net>\n"
@@ -26,208 +26,208 @@ msgstr ""
msgid "*None*"
msgstr ""
-#: src/lib/status.h:78
+#: src/lib/status.h:77
msgid ""
"\n"
"Terminated Jobs:\n"
msgstr ""
-#: src/lib/status.h:85
+#: src/lib/status.h:84
msgid " JobId Level Files Bytes Status Finished Name \n"
msgstr ""
-#: src/lib/status.h:87
+#: src/lib/status.h:86
msgid "===================================================================\n"
msgstr ""
-#: src/lib/status.h:107
+#: src/lib/status.h:106
msgid "Created"
msgstr ""
-#: src/lib/status.h:111
+#: src/lib/status.h:110
msgid "Error"
msgstr ""
-#: src/lib/status.h:114
+#: src/lib/status.h:113
msgid "Diffs"
msgstr ""
-#: src/lib/status.h:117
+#: src/lib/status.h:116
msgid "Cancel"
msgstr ""
-#: src/lib/status.h:120
+#: src/lib/status.h:119
msgid "OK"
msgstr ""
-#: src/lib/status.h:123
+#: src/lib/status.h:122
msgid "OK -- with warnings"
msgstr ""
-#: src/lib/status.h:126
+#: src/lib/status.h:125
msgid "Incomplete"
msgstr ""
-#: src/lib/status.h:129
+#: src/lib/status.h:128
msgid "Other"
msgstr ""
-#: src/lib/status.h:141
+#: src/lib/status.h:140
#, c-format
msgid "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n"
msgstr ""
-#: src/lib/status.h:149
+#: src/lib/status.h:148
#, c-format
msgid "%6d %-6s %8s %10s %-7s %-8s %s\n"
msgstr ""
-#: src/lib/status.h:178 src/lib/status.h:189 src/lib/status.h:203
-#: src/lib/status.h:207 src/lib/status.h:211
+#: src/lib/status.h:177 src/lib/status.h:188 src/lib/status.h:202
+#: src/lib/status.h:206 src/lib/status.h:210
msgid "Bacula "
msgstr ""
-#: src/qt-console/bat_conf.cpp:133
+#: src/qt-console/bat_conf.cpp:132
#, c-format
msgid "No record for %d %s\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:142
+#: src/qt-console/bat_conf.cpp:141
#, c-format
msgid "Director: name=%s address=%s DIRport=%d\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:146
+#: src/qt-console/bat_conf.cpp:145
#, c-format
msgid "Console: name=%s\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:149
-#: src/qt-console/tray-monitor/tray_conf.cpp:187
+#: src/qt-console/bat_conf.cpp:148
+#: src/qt-console/tray-monitor/tray_conf.cpp:186
#, c-format
msgid "ConsoleFont: name=%s font face=%s\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:153 src/qt-console/bat_conf.cpp:234
-#: src/qt-console/bat_conf.cpp:284 src/qt-console/bat_conf.cpp:314
+#: src/qt-console/bat_conf.cpp:152 src/qt-console/bat_conf.cpp:233
+#: src/qt-console/bat_conf.cpp:283 src/qt-console/bat_conf.cpp:313
#, c-format
msgid "Unknown resource type %d\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:262
-#: src/qt-console/tray-monitor/tray_conf.cpp:280
+#: src/qt-console/bat_conf.cpp:261
+#: src/qt-console/tray-monitor/tray_conf.cpp:279
#, c-format
msgid "%s item is required in %s resource, but not found.\n"
msgstr ""
-#: src/qt-console/bat_conf.cpp:331
-#: src/qt-console/tray-monitor/tray_conf.cpp:364
+#: src/qt-console/bat_conf.cpp:330
+#: src/qt-console/tray-monitor/tray_conf.cpp:363
#, c-format
msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:89
+#: src/qt-console/bcomm/dircomm.cpp:88
#, c-format
msgid "Already connected\"%s\".\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:100
-#: src/qt-console/tray-monitor/tray-monitor.cpp:353
+#: src/qt-console/bcomm/dircomm.cpp:99
+#: src/qt-console/tray-monitor/tray-monitor.cpp:352
#, c-format
msgid "Connecting to Director %s:%d"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:102
+#: src/qt-console/bcomm/dircomm.cpp:101
#, c-format
msgid ""
"Connecting to Director %s:%d\n"
"\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:154
+#: src/qt-console/bcomm/dircomm.cpp:153
#, c-format
msgid "Failed to initialize TLS context for Console \"%s\".\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:177
+#: src/qt-console/bcomm/dircomm.cpp:176
#, c-format
msgid "Failed to initialize TLS context for Director \"%s\".\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:199
-#: src/qt-console/tray-monitor/tray-monitor.cpp:358
+#: src/qt-console/bcomm/dircomm.cpp:198
+#: src/qt-console/tray-monitor/tray-monitor.cpp:357
msgid "Director daemon"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:237
+#: src/qt-console/bcomm/dircomm.cpp:236
msgid "Initializing ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:253 src/qt-console/console/console.cpp:134
+#: src/qt-console/bcomm/dircomm.cpp:252 src/qt-console/console/console.cpp:133
msgid "Connected"
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:377
+#: src/qt-console/bcomm/dircomm.cpp:376
msgid "Command completed ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:384 src/qt-console/console/console.cpp:371
+#: src/qt-console/bcomm/dircomm.cpp:383 src/qt-console/console/console.cpp:370
msgid "Processing command ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:391
+#: src/qt-console/bcomm/dircomm.cpp:390
msgid "At main prompt waiting for input ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:398 src/qt-console/bcomm/dircomm.cpp:408
+#: src/qt-console/bcomm/dircomm.cpp:397 src/qt-console/bcomm/dircomm.cpp:407
msgid "At prompt waiting for input ..."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:416
+#: src/qt-console/bcomm/dircomm.cpp:415
msgid "Command failed."
msgstr ""
-#: src/qt-console/bcomm/dircomm.cpp:488
+#: src/qt-console/bcomm/dircomm.cpp:487
msgid "Director disconnected."
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:111
+#: src/qt-console/bcomm/dircomm_auth.cpp:110
#, c-format
msgid "Director authorization problem at \"%s:%d\"\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:118
+#: src/qt-console/bcomm/dircomm_auth.cpp:117
#, c-format
msgid ""
"Authorization problem: Remote server at \"%s:%d\" did not advertise required "
"TLS support.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:126
+#: src/qt-console/bcomm/dircomm_auth.cpp:125
#, c-format
msgid ""
"Authorization problem with Director at \"%s:%d\": Remote server requires "
"TLS.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:137
+#: src/qt-console/bcomm/dircomm_auth.cpp:136
#, c-format
msgid "TLS negotiation failed with Director at \"%s:%d\"\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:149
+#: src/qt-console/bcomm/dircomm_auth.cpp:148
#, c-format
msgid ""
"Bad response to Hello command: ERR=%s\n"
"The Director at \"%s:%d\" is probably not running.\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:158
+#: src/qt-console/bcomm/dircomm_auth.cpp:157
#, c-format
msgid "Director at \"%s:%d\" rejected Hello command\n"
msgstr ""
-#: src/qt-console/bcomm/dircomm_auth.cpp:173
+#: src/qt-console/bcomm/dircomm_auth.cpp:172
#, c-format
msgid ""
"Authorization problem with Director at \"%s:%d\"\n"
@@ -237,16 +237,16 @@ msgid ""
"For help, please see "
msgstr ""
-#: src/qt-console/main.cpp:159
+#: src/qt-console/main.cpp:158
msgid "Cryptography library initialization failed.\n"
msgstr ""
-#: src/qt-console/main.cpp:163
+#: src/qt-console/main.cpp:162
#, c-format
msgid "Please correct configuration file: %s\n"
msgstr ""
-#: src/qt-console/main.cpp:187
+#: src/qt-console/main.cpp:186
#, c-format
msgid ""
"\n"
@@ -261,88 +261,88 @@ msgid ""
"\n"
msgstr ""
-#: src/qt-console/main.cpp:220 src/qt-console/main.cpp:250
+#: src/qt-console/main.cpp:219 src/qt-console/main.cpp:249
msgid "TLS required but not configured in Bacula.\n"
msgstr ""
-#: src/qt-console/main.cpp:228
+#: src/qt-console/main.cpp:227
#, c-format
msgid ""
"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
"Director \"%s\" in %s. At least one CA certificate store is required.\n"
msgstr ""
-#: src/qt-console/main.cpp:237
+#: src/qt-console/main.cpp:236
#, c-format
msgid ""
"No Director resource defined in %s\n"
"Without that I don't how to speak to the Director :-(\n"
msgstr ""
-#: src/qt-console/main.cpp:258
+#: src/qt-console/main.cpp:257
#, c-format
msgid ""
"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
"Console \"%s\" in %s.\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:79
+#: src/qt-console/tray-monitor/authenticate.cpp:78
msgid ""
"Director authorization problem.\n"
"Most likely the passwords do not agree.\n"
"For help, please see "
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:88
+#: src/qt-console/tray-monitor/authenticate.cpp:87
#, c-format
msgid "Bad response to Hello command: ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:95
+#: src/qt-console/tray-monitor/authenticate.cpp:94
msgid "Director rejected Hello command\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:123
+#: src/qt-console/tray-monitor/authenticate.cpp:122
#, c-format
msgid "Error sending Hello to Storage daemon. ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:129
+#: src/qt-console/tray-monitor/authenticate.cpp:128
msgid ""
"Director and Storage daemon passwords or names not the same.\n"
"For help, please see "
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:136
+#: src/qt-console/tray-monitor/authenticate.cpp:135
#, c-format
msgid "bdird<stored: bad response to Hello command: ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:143
+#: src/qt-console/tray-monitor/authenticate.cpp:142
msgid "Storage daemon rejected Hello command\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:169
+#: src/qt-console/tray-monitor/authenticate.cpp:168
#, c-format
msgid "Error sending Hello to File daemon. ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:175
+#: src/qt-console/tray-monitor/authenticate.cpp:174
msgid ""
"Director and File daemon passwords or names not the same.\n"
"For help, please see "
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:182
+#: src/qt-console/tray-monitor/authenticate.cpp:181
#, c-format
msgid "Bad response from File daemon to Hello command: ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:189
+#: src/qt-console/tray-monitor/authenticate.cpp:188
msgid "File daemon rejected Hello command\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:59
+#: src/qt-console/tray-monitor/tray-monitor.cpp:58
#, c-format
msgid ""
"\n"
@@ -357,14 +357,14 @@ msgid ""
"\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:210
+#: src/qt-console/tray-monitor/tray-monitor.cpp:209
#, c-format
msgid ""
"Error: %d Monitor resources defined in %s. You must define one and only one "
"Monitor resource.\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:242
+#: src/qt-console/tray-monitor/tray-monitor.cpp:241
#, c-format
msgid ""
"No Client, Storage or Director resource defined in %s\n"
@@ -372,7 +372,7 @@ msgid ""
"Daemon :-(\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:257
+#: src/qt-console/tray-monitor/tray-monitor.cpp:256
#, c-format
msgid ""
"Invalid refresh interval defined in %s\n"
@@ -380,106 +380,106 @@ msgid ""
"minutes (read value: %d).\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:325
+#: src/qt-console/tray-monitor/tray-monitor.cpp:324
#, c-format
msgid "Error, currentitem is not a Client or a Storage..\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:363
+#: src/qt-console/tray-monitor/tray-monitor.cpp:362
#, c-format
msgid "Connecting to Client %s:%d"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:368
+#: src/qt-console/tray-monitor/tray-monitor.cpp:367
msgid "File daemon"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:373
+#: src/qt-console/tray-monitor/tray-monitor.cpp:372
#, c-format
msgid "Connecting to Storage %s:%d"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:378
+#: src/qt-console/tray-monitor/tray-monitor.cpp:377
msgid "Storage daemon"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:382
-#: src/qt-console/tray-monitor/tray-monitor.cpp:412
+#: src/qt-console/tray-monitor/tray-monitor.cpp:381
+#: src/qt-console/tray-monitor/tray-monitor.cpp:411
#, c-format
msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:387
+#: src/qt-console/tray-monitor/tray-monitor.cpp:386
msgid "Cannot connect to daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:396
+#: src/qt-console/tray-monitor/tray-monitor.cpp:395
#, c-format
msgid "Authentication error : %s"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:403
+#: src/qt-console/tray-monitor/tray-monitor.cpp:402
msgid "Opened connection with Director daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:406
+#: src/qt-console/tray-monitor/tray-monitor.cpp:405
msgid "Opened connection with File daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:409
+#: src/qt-console/tray-monitor/tray-monitor.cpp:408
msgid "Opened connection with Storage daemon."
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:460
+#: src/qt-console/tray-monitor/tray-monitor.cpp:459
msgid "Error : BNET_HARDEOF or BNET_ERROR"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:469
+#: src/qt-console/tray-monitor/tray-monitor.cpp:468
msgid "Error : Connection closed."
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:160
+#: src/qt-console/tray-monitor/tray_conf.cpp:159
#, c-format
msgid "No %s resource defined\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:169
+#: src/qt-console/tray-monitor/tray_conf.cpp:168
#, c-format
msgid "Monitor: name=%s FDtimeout=%s SDtimeout=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:175
+#: src/qt-console/tray-monitor/tray_conf.cpp:174
#, c-format
msgid "Director: name=%s address=%s FDport=%d\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:179
+#: src/qt-console/tray-monitor/tray_conf.cpp:178
#, c-format
msgid "Client: name=%s address=%s FDport=%d\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:183
+#: src/qt-console/tray-monitor/tray_conf.cpp:182
#, c-format
msgid "Storage: name=%s address=%s SDport=%d\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:191
+#: src/qt-console/tray-monitor/tray_conf.cpp:190
#, c-format
msgid "Unknown resource type %d in dump_resource.\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:249
+#: src/qt-console/tray-monitor/tray_conf.cpp:248
#, c-format
msgid "Unknown resource type %d in free_resource.\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:286
+#: src/qt-console/tray-monitor/tray_conf.cpp:285
#, c-format
msgid "Too many items in %s resource\n"
msgstr ""
-#: src/qt-console/tray-monitor/tray_conf.cpp:306
-#: src/qt-console/tray-monitor/tray_conf.cpp:344
+#: src/qt-console/tray-monitor/tray_conf.cpp:305
+#: src/qt-console/tray-monitor/tray_conf.cpp:343
#, c-format
msgid "Unknown resource type %d in save_resource.\n"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 89af817..f6e93d0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,6 +1,6 @@
# Ukrainian translations for bacula package
# Український переклад bacula.
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
# License: BSD 2-Clause; see file LICENSE-FOSS
# Vitaliy Kosharskiy <vkosharskiy at ukrcard.com.ua>, 2010.
#
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: bacula 3.0.3\n"
"Report-Msgid-Bugs-To: bacula-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2015-08-09 15:05+0200\n"
+"POT-Creation-Date: 2016-01-10 15:13+0100\n"
"PO-Revision-Date: 2010-01-08 17:32+0300\n"
"Last-Translator: Vitaliy Kosharskiy <kisa_co at ukrpost.net>\n"
"Language-Team: Ukrainian\n"
@@ -29,118 +29,118 @@ msgstr ""
msgid "*None*"
msgstr ""
-#: src/lib/status.h:78
+#: src/lib/status.h:77
msgid ""
"\n"
"Terminated Jobs:\n"
msgstr ""
-#: src/lib/status.h:85
+#: src/lib/status.h:84
msgid " JobId Level Files Bytes Status Finished Name \n"
msgstr ""
-#: src/lib/status.h:87
+#: src/lib/status.h:86
msgid "===================================================================\n"
msgstr ""
-#: src/lib/status.h:107
+#: src/lib/status.h:106
msgid "Created"
msgstr ""
-#: src/lib/status.h:111
+#: src/lib/status.h:110
msgid "Error"
msgstr ""
-#: src/lib/status.h:114
+#: src/lib/status.h:113
msgid "Diffs"
msgstr ""
-#: src/lib/status.h:117
+#: src/lib/status.h:116
msgid "Cancel"
msgstr ""
-#: src/lib/status.h:120
+#: src/lib/status.h:119
msgid "OK"
msgstr ""
-#: src/lib/status.h:123
+#: src/lib/status.h:122
msgid "OK -- with warnings"
msgstr ""
-#: src/lib/status.h:126
+#: src/lib/status.h:125
msgid "Incomplete"
msgstr ""
-#: src/lib/status.h:129
+#: src/lib/status.h:128
msgid "Other"
msgstr ""
-#: src/lib/status.h:141
+#: src/lib/status.h:140
#, c-format
msgid "%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n"
msgstr ""
-#: src/lib/status.h:149
+#: src/lib/status.h:148
#, c-format
msgid "%6d %-6s %8s %10s %-7s %-8s %s\n"
msgstr ""
-#: src/lib/status.h:178 src/lib/status.h:189 src/lib/status.h:203
-#: src/lib/status.h:207 src/lib/status.h:211
+#: src/lib/status.h:177 src/lib/status.h:188 src/lib/status.h:202
+#: src/lib/status.h:206 src/lib/status.h:210
msgid "Bacula "
msgstr ""
-#: src/qt-console/bat_conf.cpp:133
+#: src/qt-console/bat_conf.cpp:132
#, c-format
msgid "No record for %d %s\n"
msgstr "Відсутні записи для %d %s\n"
-#: src/qt-console/bat_conf.cpp:142
+#: src/qt-console/bat_conf.cpp:141
#, c-format
msgid "Director: name=%s address=%s DIRport=%d\n"
msgstr "Керівник: назва=%s адреса=%s DIRport=%d\n"
-#: src/qt-console/bat_conf.cpp:146
+#: src/qt-console/bat_conf.cpp:145
#, c-format
msgid "Console: name=%s\n"
msgstr "Консоль: назва=%s\n"
-#: src/qt-console/bat_conf.cpp:149
-#: src/qt-console/tray-monitor/tray_conf.cpp:187
+#: src/qt-console/bat_conf.cpp:148
+#: src/qt-console/tray-monitor/tray_conf.cpp:186
#, fuzzy, c-format
msgid "ConsoleFont: name=%s font face=%s\n"
msgstr "Консоль: назва=%s rcfile=%s histfile=%s\n"
-#: src/qt-console/bat_conf.cpp:153 src/qt-console/bat_conf.cpp:234
-#: src/qt-console/bat_conf.cpp:284 src/qt-console/bat_conf.cpp:314
+#: src/qt-console/bat_conf.cpp:152 src/qt-console/bat_conf.cpp:233
+#: src/qt-console/bat_conf.cpp:283 src/qt-console/bat_conf.cpp:313
#, c-format
msgid "Unknown resource type %d\n"
msgstr "Невідомий тип ресурсу %d\n"
-#: src/qt-console/bat_conf.cpp:262
-#: src/qt-console/tray-monitor/tray_conf.cpp:280
+#: src/qt-console/bat_conf.cpp:261
+#: src/qt-console/tray-monitor/tray_conf.cpp:279
#, c-format
msgid "%s item is required in %s resource, but not found.\n"
msgstr "Не знайдено необхідний елемент %s для ресурсу %s.\n"
-#: src/qt-console/bat_conf.cpp:331
-#: src/qt-console/tray-monitor/tray_conf.cpp:364
+#: src/qt-console/bat_conf.cpp:330
+#: src/qt-console/tray-monitor/tray_conf.cpp:363
#, c-format
msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
msgstr "Спроба визначити другий %s ресурс із назвою \"%s\" не дозволяється.\n"
-#: src/qt-console/bcomm/dircomm.cpp:89
+#: src/qt-console/bcomm/dircomm.cpp:88
#, c-format
msgid "Already connected\"%s\".\n"
msgstr "Вже приєднано\"%s\".\n"
-#: src/qt-console/bcomm/dircomm.cpp:100
-#: src/qt-console/tray-monitor/tray-monitor.cpp:353
+#: src/qt-console/bcomm/dircomm.cpp:99
+#: src/qt-console/tray-monitor/tray-monitor.cpp:352
#, c-format
msgid "Connecting to Director %s:%d"
msgstr "Приєднуюсь до Керівника %s:%d"
-#: src/qt-console/bcomm/dircomm.cpp:102
+#: src/qt-console/bcomm/dircomm.cpp:101
#, c-format
msgid ""
"Connecting to Director %s:%d\n"
@@ -149,59 +149,59 @@ msgstr ""
"З'єднуюсь із Керівником %s:%d\n"
"\n"
-#: src/qt-console/bcomm/dircomm.cpp:154
+#: src/qt-console/bcomm/dircomm.cpp:153
#, c-format
msgid "Failed to initialize TLS context for Console \"%s\".\n"
msgstr "Ініціалізація контексту TLS для Консолі невдала \"%s\".\n"
-#: src/qt-console/bcomm/dircomm.cpp:177
+#: src/qt-console/bcomm/dircomm.cpp:176
#, c-format
msgid "Failed to initialize TLS context for Director \"%s\".\n"
msgstr "Ініціалізація контексту TLS для Керівника невдала \"%s\".\n"
-#: src/qt-console/bcomm/dircomm.cpp:199
-#: src/qt-console/tray-monitor/tray-monitor.cpp:358
+#: src/qt-console/bcomm/dircomm.cpp:198
+#: src/qt-console/tray-monitor/tray-monitor.cpp:357
msgid "Director daemon"
msgstr "Керівник"
-#: src/qt-console/bcomm/dircomm.cpp:237
+#: src/qt-console/bcomm/dircomm.cpp:236
msgid "Initializing ..."
msgstr "Ініціалізація ..."
-#: src/qt-console/bcomm/dircomm.cpp:253 src/qt-console/console/console.cpp:134
+#: src/qt-console/bcomm/dircomm.cpp:252 src/qt-console/console/console.cpp:133
msgid "Connected"
msgstr "З'єднано"
-#: src/qt-console/bcomm/dircomm.cpp:377
+#: src/qt-console/bcomm/dircomm.cpp:376
msgid "Command completed ..."
msgstr "Команду виконано ..."
-#: src/qt-console/bcomm/dircomm.cpp:384 src/qt-console/console/console.cpp:371
+#: src/qt-console/bcomm/dircomm.cpp:383 src/qt-console/console/console.cpp:370
msgid "Processing command ..."
msgstr "Виконання команди ..."
-#: src/qt-console/bcomm/dircomm.cpp:391
+#: src/qt-console/bcomm/dircomm.cpp:390
msgid "At main prompt waiting for input ..."
msgstr "Очікуться введення у основній рядку ..."
-#: src/qt-console/bcomm/dircomm.cpp:398 src/qt-console/bcomm/dircomm.cpp:408
+#: src/qt-console/bcomm/dircomm.cpp:397 src/qt-console/bcomm/dircomm.cpp:407
msgid "At prompt waiting for input ..."
msgstr "Очікуться введення у рядку ..."
-#: src/qt-console/bcomm/dircomm.cpp:416
+#: src/qt-console/bcomm/dircomm.cpp:415
msgid "Command failed."
msgstr "Помилка команди"
-#: src/qt-console/bcomm/dircomm.cpp:488
+#: src/qt-console/bcomm/dircomm.cpp:487
msgid "Director disconnected."
msgstr "Керівник від'єднано"
-#: src/qt-console/bcomm/dircomm_auth.cpp:111
+#: src/qt-console/bcomm/dircomm_auth.cpp:110
#, c-format
msgid "Director authorization problem at \"%s:%d\"\n"
msgstr "Проблеми авторизації Директора \"%s:%d\"\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:118
+#: src/qt-console/bcomm/dircomm_auth.cpp:117
#, c-format
msgid ""
"Authorization problem: Remote server at \"%s:%d\" did not advertise required "
@@ -210,7 +210,7 @@ msgstr ""
"Проблеми авторизації: Віддалений сервер \"%s:%d\" не повідомляє про "
"необхідність використання TLS.\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:126
+#: src/qt-console/bcomm/dircomm_auth.cpp:125
#, c-format
msgid ""
"Authorization problem with Director at \"%s:%d\": Remote server requires "
@@ -218,12 +218,12 @@ msgid ""
msgstr ""
"Проблеми авторизації Керівника \"%s:%d\": Віддалений сепвер вимагає TLS.\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:137
+#: src/qt-console/bcomm/dircomm_auth.cpp:136
#, c-format
msgid "TLS negotiation failed with Director at \"%s:%d\"\n"
msgstr "Встановлення TLS із Керівником невдале \"%s:%d\"\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:149
+#: src/qt-console/bcomm/dircomm_auth.cpp:148
#, c-format
msgid ""
"Bad response to Hello command: ERR=%s\n"
@@ -232,12 +232,12 @@ msgstr ""
"Погана відповідь на команду Hello: ERR=%s\n"
"Керівник \"%s:%d\" ймовірно не запущений.\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:158
+#: src/qt-console/bcomm/dircomm_auth.cpp:157
#, c-format
msgid "Director at \"%s:%d\" rejected Hello command\n"
msgstr "Керівник \"%s:%d\" відкинув команду Hello\n"
-#: src/qt-console/bcomm/dircomm_auth.cpp:173
+#: src/qt-console/bcomm/dircomm_auth.cpp:172
#, fuzzy, c-format
msgid ""
"Authorization problem with Director at \"%s:%d\"\n"
@@ -253,16 +253,16 @@ msgstr ""
"Для отримання допомоги, будь ласка, перегляньте http://www.bacula.org/en/rel-"
"manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000.\n"
-#: src/qt-console/main.cpp:159
+#: src/qt-console/main.cpp:158
msgid "Cryptography library initialization failed.\n"
msgstr "Ініціалізація криптографії невдала.\n"
-#: src/qt-console/main.cpp:163
+#: src/qt-console/main.cpp:162
#, c-format
msgid "Please correct configuration file: %s\n"
msgstr "Будьласка виправте файл конфігурації: %s\n"
-#: src/qt-console/main.cpp:187
+#: src/qt-console/main.cpp:186
#, fuzzy, c-format
msgid ""
"\n"
@@ -287,11 +287,11 @@ msgstr ""
" -? print this message.\n"
"\n"
-#: src/qt-console/main.cpp:220 src/qt-console/main.cpp:250
+#: src/qt-console/main.cpp:219 src/qt-console/main.cpp:249
msgid "TLS required but not configured in Bacula.\n"
msgstr "TLS необхідний, але не налаштовано у Bacula.\n"
-#: src/qt-console/main.cpp:228
+#: src/qt-console/main.cpp:227
#, c-format
msgid ""
"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -301,7 +301,7 @@ msgstr ""
"задано для Керівника \"%s\" у %s. Необхідне щонайменше одне сховище для "
"сертифікату CA.\n"
-#: src/qt-console/main.cpp:237
+#: src/qt-console/main.cpp:236
#, c-format
msgid ""
"No Director resource defined in %s\n"
@@ -310,7 +310,7 @@ msgstr ""
"У %s не задано ресурсу Керівника\n"
"Без цього я не знаю як спілкуватись із Керівником :-(\n"
-#: src/qt-console/main.cpp:258
+#: src/qt-console/main.cpp:257
#, c-format
msgid ""
"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -319,7 +319,7 @@ msgstr ""
"Жоден із параметрів \"TLS CA Certificate\" або \"TLS CA Certificate Dir\" не "
"задано для Консолі \"%s\" у %s.\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:79
+#: src/qt-console/tray-monitor/authenticate.cpp:78
#, fuzzy
msgid ""
"Director authorization problem.\n"
@@ -331,56 +331,56 @@ msgstr ""
"Для отримання допомоги, будь ласка, перегляньте http://www.bacula.org/en/rel-"
"manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000.\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:88
+#: src/qt-console/tray-monitor/authenticate.cpp:87
#, c-format
msgid "Bad response to Hello command: ERR=%s\n"
msgstr "Погана відповідь на команду Hello: ERR=%s\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:95
+#: src/qt-console/tray-monitor/authenticate.cpp:94
msgid "Director rejected Hello command\n"
msgstr "Керівник не прийняв команду Hello\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:123
+#: src/qt-console/tray-monitor/authenticate.cpp:122
#, c-format
msgid "Error sending Hello to Storage daemon. ERR=%s\n"
msgstr "Не вдалося надіслати Hello до Зберігача. ERR=%s\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:129
+#: src/qt-console/tray-monitor/authenticate.cpp:128
msgid ""
"Director and Storage daemon passwords or names not the same.\n"
"For help, please see "
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:136
+#: src/qt-console/tray-monitor/authenticate.cpp:135
#, c-format
msgid "bdird<stored: bad response to Hello command: ERR=%s\n"
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:143
+#: src/qt-console/tray-monitor/authenticate.cpp:142
msgid "Storage daemon rejected Hello command\n"
msgstr "Зберігач відхилив команду Hello\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:169
+#: src/qt-console/tray-monitor/authenticate.cpp:168
#, c-format
msgid "Error sending Hello to File daemon. ERR=%s\n"
msgstr "Помилка надсилання Hello до Збирача. ERR=%s\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:175
+#: src/qt-console/tray-monitor/authenticate.cpp:174
msgid ""
"Director and File daemon passwords or names not the same.\n"
"For help, please see "
msgstr ""
-#: src/qt-console/tray-monitor/authenticate.cpp:182
+#: src/qt-console/tray-monitor/authenticate.cpp:181
#, c-format
msgid "Bad response from File daemon to Hello command: ERR=%s\n"
msgstr "Невірна відповідь від Збирача на команду Hello: ERR=%s\n"
-#: src/qt-console/tray-monitor/authenticate.cpp:189
+#: src/qt-console/tray-monitor/authenticate.cpp:188
msgid "File daemon rejected Hello command\n"
msgstr "Збирач відхилив команду Hello \n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:59
+#: src/qt-console/tray-monitor/tray-monitor.cpp:58
#, fuzzy, c-format
msgid ""
"\n"
@@ -406,7 +406,7 @@ msgstr ""
" -? показати це повідомлення.\n"
"\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:210
+#: src/qt-console/tray-monitor/tray-monitor.cpp:209
#, c-format
msgid ""
"Error: %d Monitor resources defined in %s. You must define one and only one "
@@ -415,7 +415,7 @@ msgstr ""
"Помилка: %d ресурсів Спостерігача визначено у %s. Ви повинні визначити одині "
"тільки один ресурс Спостерігача.\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:242
+#: src/qt-console/tray-monitor/tray-monitor.cpp:241
#, c-format
msgid ""
"No Client, Storage or Director resource defined in %s\n"
@@ -425,7 +425,7 @@ msgstr ""
"У %s не визначено жодного ресурсу Клієнту, Зберігача або Керівника\n"
"Без цього я не знаю як отримати статус Зберігача, Збирача або Керівника\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:257
+#: src/qt-console/tray-monitor/tray-monitor.cpp:256
#, c-format
msgid ""
"Invalid refresh interval defined in %s\n"
@@ -436,106 +436,106 @@ msgstr ""
"Це значення повинно бути не меньше 1 секунди та не більше 10 хвилин "
"(теперішнє значення: %d).\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:325
+#: src/qt-console/tray-monitor/tray-monitor.cpp:324
#, c-format
msgid "Error, currentitem is not a Client or a Storage..\n"
msgstr "Помилка. Поточний пункт не є Клієнтом або Зберігачем.\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:363
+#: src/qt-console/tray-monitor/tray-monitor.cpp:362
#, c-format
msgid "Connecting to Client %s:%d"
msgstr "Приєднуюсь до Клієнта %s:%d"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:368
+#: src/qt-console/tray-monitor/tray-monitor.cpp:367
msgid "File daemon"
msgstr "Збирач"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:373
+#: src/qt-console/tray-monitor/tray-monitor.cpp:372
#, c-format
msgid "Connecting to Storage %s:%d"
msgstr "Приєднуюсь до Зберігача %s:%d"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:378
+#: src/qt-console/tray-monitor/tray-monitor.cpp:377
msgid "Storage daemon"
msgstr "Зберігач"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:382
-#: src/qt-console/tray-monitor/tray-monitor.cpp:412
+#: src/qt-console/tray-monitor/tray-monitor.cpp:381
+#: src/qt-console/tray-monitor/tray-monitor.cpp:411
#, c-format
msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
msgstr "Помилка. Поточний пункт не є Клієнтом або Зберігачем.\n"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:387
+#: src/qt-console/tray-monitor/tray-monitor.cpp:386
msgid "Cannot connect to daemon."
msgstr "Не можу приєднатись до демону."
-#: src/qt-console/tray-monitor/tray-monitor.cpp:396
+#: src/qt-console/tray-monitor/tray-monitor.cpp:395
#, c-format
msgid "Authentication error : %s"
msgstr "Помилка автентифікації : %s"
-#: src/qt-console/tray-monitor/tray-monitor.cpp:403
+#: src/qt-console/tray-monitor/tray-monitor.cpp:402
msgid "Opened connection with Director daemon."
msgstr "Відкриті з'єднання із Керівником."
-#: src/qt-console/tray-monitor/tray-monitor.cpp:406
+#: src/qt-console/tray-monitor/tray-monitor.cpp:405
msgid "Opened connection with File daemon."
msgstr "Відкриті з'єднання із Збирачем."
-#: src/qt-console/tray-monitor/tray-monitor.cpp:409
+#: src/qt-console/tray-monitor/tray-monitor.cpp:408
msgid "Opened connection with Storage daemon."
msgstr "Відкриті з'єднання із Зберігачем."
-#: src/qt-console/tray-monitor/tray-monitor.cpp:460
+#: src/qt-console/tray-monitor/tray-monitor.cpp:459
msgid "Error : BNET_HARDEOF or BNET_ERROR"
msgstr ""
-#: src/qt-console/tray-monitor/tray-monitor.cpp:469
+#: src/qt-console/tray-monitor/tray-monitor.cpp:468
msgid "Error : Connection closed."
msgstr "Помилка : З'єднання завершено"
-#: src/qt-console/tray-monitor/tray_conf.cpp:160
+#: src/qt-console/tray-monitor/tray_conf.cpp:159
#, c-format
msgid "No %s resource defined\n"
msgstr "Ресурс %s не визначено\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:169
+#: src/qt-console/tray-monitor/tray_conf.cpp:168
#, c-format
msgid "Monitor: name=%s FDtimeout=%s SDtimeout=%s\n"
msgstr "Споглядач: назва=%s FDtimeout=%s SDtimeout=%s\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:175
+#: src/qt-console/tray-monitor/tray_conf.cpp:174
#, c-format
msgid "Director: name=%s address=%s FDport=%d\n"
msgstr "Керівник: назва=%s address=%s FDport=%d\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:179
+#: src/qt-console/tray-monitor/tray_conf.cpp:178
#, c-format
msgid "Client: name=%s address=%s FDport=%d\n"
msgstr "Клієнт: назва=%s address=%s FDport=%d\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:183
+#: src/qt-console/tray-monitor/tray_conf.cpp:182
#, c-format
msgid "Storage: name=%s address=%s SDport=%d\n"
msgstr "Сховище: назва=%s address=%s SDport=%d\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:191
+#: src/qt-console/tray-monitor/tray_conf.cpp:190
#, c-format
msgid "Unknown resource type %d in dump_resource.\n"
msgstr "Невідомий тип ресурсу %d у dump_resource.\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:249
+#: src/qt-console/tray-monitor/tray_conf.cpp:248
#, c-format
msgid "Unknown resource type %d in free_resource.\n"
msgstr "Невідомий тип ресурсу %d у free_resource.\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:286
+#: src/qt-console/tray-monitor/tray_conf.cpp:285
#, c-format
msgid "Too many items in %s resource\n"
msgstr "Забагато елементів у ресурсі %s\n"
-#: src/qt-console/tray-monitor/tray_conf.cpp:306
-#: src/qt-console/tray-monitor/tray_conf.cpp:344
+#: src/qt-console/tray-monitor/tray_conf.cpp:305
+#: src/qt-console/tray-monitor/tray_conf.cpp:343
#, c-format
msgid "Unknown resource type %d in save_resource.\n"
msgstr "Невідомий тип ресурсу %d у save_resource.\n"
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 47e1d90..e9b529d 100755
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,6 +1,6 @@
#
#
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
# License: BSD 2-Clause; see file LICENSE-FOSS
#
@MCOMMON@
diff --git a/scripts/bacula-ctl-dir.in b/scripts/bacula-ctl-dir.in
index 745651c..ab1eaac 100644
--- a/scripts/bacula-ctl-dir.in
+++ b/scripts/bacula-ctl-dir.in
@@ -2,8 +2,7 @@
#
# Bacula(R) - The Network Backup Solution
#
-# Copyright (C) 2000-2015 Kern Sibbald
-# Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+# Copyright (C) 2000-2016 Kern Sibbald
#
# The original author of Bacula is Kern Sibbald, with contributions
# from many others, a complete list can be found in the file AUTHORS.
@@ -19,7 +18,7 @@
# Bacula(R) is a registered trademark of Kern Sibbald.
#
# bacula-ctl-dir This shell script takes care of starting and stopping
-# the bacula Director daemon
+# the bacula Director daemon
#
# This is pretty much watered down version of the RedHat script
# that works on Solaris as well as Linux, but it won't work everywhere.
@@ -53,7 +52,7 @@ DIR_PORT=@dir_port@
DIR_USER=@dir_user@
DIR_GROUP=@dir_group@
Bacula="@BACULA@"
-PIDOF=@PIDOF@
+PIDOF=@PIDOF@
# A function to stop a program.
killproc() {
@@ -82,31 +81,31 @@ killproc() {
# Kill it.
if [ "$pid" != "" ] ; then
if [ "$notset" = "1" ] ; then
- if ${PS} -p "$pid">/dev/null 2>&1; then
- # TERM first, then KILL if not dead
- kill -TERM $pid 2>/dev/null
- sleep 1
- if ${PS} -p "$pid" >/dev/null 2>&1 ; then
- sleep 1
- if ${PS} -p "$pid" >/dev/null 2>&1 ; then
- sleep 3
- if ${PS} -p "$pid" >/dev/null 2>&1 ; then
- kill -KILL $pid 2>/dev/null
- fi
- fi
- fi
- fi
- ${PS} -p "$pid" >/dev/null 2>&1
- RC=$?
- [ $RC -eq 0 ] && failure "$base shutdown" || success "$base shutdown"
+ if ${PS} -p "$pid">/dev/null 2>&1; then
+ # TERM first, then KILL if not dead
+ kill -TERM $pid 2>/dev/null
+ sleep 1
+ if ${PS} -p "$pid" >/dev/null 2>&1 ; then
+ sleep 1
+ if ${PS} -p "$pid" >/dev/null 2>&1 ; then
+ sleep 3
+ if ${PS} -p "$pid" >/dev/null 2>&1 ; then
+ kill -KILL $pid 2>/dev/null
+ fi
+ fi
+ fi
+ fi
+ ${PS} -p "$pid" >/dev/null 2>&1
+ RC=$?
+ [ $RC -eq 0 ] && failure "$base shutdown" || success "$base shutdown"
# RC=$((! $RC))
# use specified level only
else
- if ${PS} -p "$pid" >/dev/null 2>&1; then
- kill $killlevel $pid 2>/dev/null
- RC=$?
- [ $RC -eq 0 ] && success "$base $killlevel" || failure "$base $killlevel"
- fi
+ if ${PS} -p "$pid" >/dev/null 2>&1; then
+ kill $killlevel $pid 2>/dev/null
+ RC=$?
+ [ $RC -eq 0 ] && success "$base $killlevel" || failure "$base $killlevel"
+ fi
fi
else
failure "$base shutdown"
@@ -134,8 +133,8 @@ pidofproc() {
if [ -f ${PIDDIR}/$base.$2.pid ] ; then
pid=`head -n 1 ${PIDDIR}/$base.$2.pid`
if [ "$pid" != "" ] ; then
- echo $pid
- return 0
+ echo $pid
+ return 0
fi
fi
@@ -174,12 +173,12 @@ status() {
return 0
else
pid=`${PSCMD} | ${AWK} 'BEGIN { prog=ARGV[1]; ARGC=1 }
- { if ((prog == $2) || (("(" prog ")") == $2) ||
- (("[" prog "]") == $2) ||
- ((prog ":") == $2)) { print $1 ; exit 0 } }' $1`
+ { if ((prog == $2) || (("(" prog ")") == $2) ||
+ (("[" prog "]") == $2) ||
+ ((prog ":") == $2)) { print $1 ; exit 0 } }' $1`
if [ "$pid" != "" ] ; then
- echo "$base (pid $pid) is running..."
- return 0
+ echo "$base (pid $pid) is running..."
+ return 0
fi
fi
@@ -187,8 +186,8 @@ status() {
if [ -f ${PIDDIR}/$base.$2.pid ] ; then
pid=`head -n 1 ${PIDDIR}/$base.$2.pid`
if [ "$pid" != "" ] ; then
- echo "$base dead but pid file exists"
- return 1
+ echo "$base dead but pid file exists"
+ return 1
fi
fi
# See if the subsys lock exists
@@ -219,29 +218,29 @@ fi
case "$1" in
start)
[ -x ${BACDIRBIN}/bacula-dir ] && {
- echo "Starting the $Bacula Director daemon"
- OPTIONS=''
- if [ "${DIR_USER}" != '' ]; then
- OPTIONS="${OPTIONS} -u ${DIR_USER}"
- fi
+ echo "Starting the $Bacula Director daemon"
+ OPTIONS=''
+ if [ "${DIR_USER}" != '' ]; then
+ OPTIONS="${OPTIONS} -u ${DIR_USER}"
+ fi
- if [ "${DIR_GROUP}" != '' ]; then
- OPTIONS="${OPTIONS} -g ${DIR_GROUP}"
- fi
+ if [ "${DIR_GROUP}" != '' ]; then
+ OPTIONS="${OPTIONS} -g ${DIR_GROUP}"
+ fi
- if [ "x${VALGRIND_DIR}" = "x1" ]; then
- valgrind --leak-check=full ${BACDIRBIN}/bacula-dir $2 $3 ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf
- else
- ${BACDIRBIN}/bacula-dir $2 $3 ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf
- fi
- sleep 1
+ if [ "x${VALGRIND_DIR}" = "x1" ]; then
+ valgrind --leak-check=full ${BACDIRBIN}/bacula-dir $2 $3 ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf
+ else
+ ${BACDIRBIN}/bacula-dir $2 $3 ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf
+ fi
+ sleep 1
}
;;
stop)
[ -x ${BACDIRBIN}/bacula-dir ] && {
- echo "Stopping the $Bacula Director daemon"
- killproc ${BACDIRBIN}/bacula-dir ${DIR_PORT} $2
+ echo "Stopping the $Bacula Director daemon"
+ killproc ${BACDIRBIN}/bacula-dir ${DIR_PORT} $2
}
;;
diff --git a/scripts/bacula-ctl-fd.in b/scripts/bacula-ctl-fd.in
index c359eae..0032f0b 100644
--- a/scripts/bacula-ctl-fd.in
+++ b/scripts/bacula-ctl-fd.in
@@ -2,8 +2,7 @@
#
# Bacula(R) - The Network Backup Solution
#
-# Copyright (C) 2000-2015 Kern Sibbald
-# Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+# Copyright (C) 2000-2016 Kern Sibbald
#
# The original author of Bacula is Kern Sibbald, with contributions
# from many others, a complete list can be found in the file AUTHORS.
@@ -19,7 +18,7 @@
# Bacula(R) is a registered trademark of Kern Sibbald.
#
# bacula-ctl-fd This shell script takes care of starting and stopping
-# the bacula File daemon.
+# the bacula File daemon.
#
# This is pretty much watered down version of the RedHat script
# that works on Solaris as well as Linux, but it won't work everywhere.
@@ -50,7 +49,7 @@ FD_PORT=@fd_port@
FD_USER=@fd_user@
FD_GROUP=@fd_group@
Bacula="@BACULA@"
-PIDOF=@PIDOF@
+PIDOF=@PIDOF@
# A function to stop a program.
killproc() {
@@ -79,31 +78,31 @@ killproc() {
# Kill it.
if [ "$pid" != "" ] ; then
if [ "$notset" = "1" ] ; then
- if ${PS} -p "$pid">/dev/null 2>&1; then
- # TERM first, then KILL if not dead
- kill -TERM $pid 2>/dev/null
- sleep 1
- if ${PS} -p "$pid" >/dev/null 2>&1 ; then
- sleep 1
- if ${PS} -p "$pid" >/dev/null 2>&1 ; then
- sleep 3
- if ${PS} -p "$pid" >/dev/null 2>&1 ; then
- kill -KILL $pid 2>/dev/null
- fi
- fi
- fi
- fi
- ${PS} -p "$pid" >/dev/null 2>&1
- RC=$?
- [ $RC -eq 0 ] && failure "$base shutdown" || success "$base shutdown"
+ if ${PS} -p "$pid">/dev/null 2>&1; then
+ # TERM first, then KILL if not dead
+ kill -TERM $pid 2>/dev/null
+ sleep 1
+ if ${PS} -p "$pid" >/dev/null 2>&1 ; then
+ sleep 1
+ if ${PS} -p "$pid" >/dev/null 2>&1 ; then
+ sleep 3
+ if ${PS} -p "$pid" >/dev/null 2>&1 ; then
+ kill -KILL $pid 2>/dev/null
+ fi
+ fi
+ fi
+ fi
+ ${PS} -p "$pid" >/dev/null 2>&1
+ RC=$?
+ [ $RC -eq 0 ] && failure "$base shutdown" || success "$base shutdown"
# RC=$((! $RC))
# use specified level only
else
- if ${PS} -p "$pid" >/dev/null 2>&1; then
- kill $killlevel $pid 2>/dev/null
- RC=$?
- [ $RC -eq 0 ] && success "$base $killlevel" || failure "$base $killlevel"
- fi
+ if ${PS} -p "$pid" >/dev/null 2>&1; then
+ kill $killlevel $pid 2>/dev/null
+ RC=$?
+ [ $RC -eq 0 ] && success "$base $killlevel" || failure "$base $killlevel"
+ fi
fi
else
failure "$base shutdown"
@@ -131,8 +130,8 @@ pidofproc() {
if [ -f ${PIDDIR}/$base.$2.pid ] ; then
pid=`head -n 1 ${PIDDIR}/$base.$2.pid`
if [ "$pid" != "" ] ; then
- echo $pid
- return 0
+ echo $pid
+ return 0
fi
fi
@@ -171,12 +170,12 @@ status() {
return 0
else
pid=`${PSCMD} | ${AWK} 'BEGIN { prog=ARGV[1]; ARGC=1 }
- { if ((prog == $2) || (("(" prog ")") == $2) ||
- (("[" prog "]") == $2) ||
- ((prog ":") == $2)) { print $1 ; exit 0 } }' $1`
+ { if ((prog == $2) || (("(" prog ")") == $2) ||
+ (("[" prog "]") == $2) ||
+ ((prog ":") == $2)) { print $1 ; exit 0 } }' $1`
if [ "$pid" != "" ] ; then
- echo "$base (pid $pid) is running..."
- return 0
+ echo "$base (pid $pid) is running..."
+ return 0
fi
fi
@@ -184,8 +183,8 @@ status() {
if [ -f ${PIDDIR}/$base.$2.pid ] ; then
pid=`head -n 1 ${PIDDIR}/$base.$2.pid`
if [ "$pid" != "" ] ; then
- echo "$base dead but pid file exists"
- return 1
+ echo "$base dead but pid file exists"
+ return 1
fi
fi
# See if the subsys lock exists
@@ -216,29 +215,29 @@ fi
case "$1" in
start)
[ -x ${BACFDBIN}/bacula-fd ] && {
- echo "Starting the $Bacula File daemon"
- OPTIONS=''
- if [ "${FD_USER}" != '' ]; then
- OPTIONS="${OPTIONS} -u ${FD_USER}"
- fi
+ echo "Starting the $Bacula File daemon"
+ OPTIONS=''
+ if [ "${FD_USER}" != '' ]; then
+ OPTIONS="${OPTIONS} -u ${FD_USER}"
+ fi
- if [ "${FD_GROUP}" != '' ]; then
- OPTIONS="${OPTIONS} -g ${FD_GROUP}"
- fi
+ if [ "${FD_GROUP}" != '' ]; then
+ OPTIONS="${OPTIONS} -g ${FD_GROUP}"
+ fi
- if [ "x${VALGRIND_FD}" = "x1" ]; then
- valgrind --leak-check=full ${BACFDBIN}/bacula-fd $2 $3 ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf
- else
- ${BACFDBIN}/bacula-fd $2 $3 ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf
- fi
+ if [ "x${VALGRIND_FD}" = "x1" ]; then
+ valgrind --leak-check=full ${BACFDBIN}/bacula-fd $2 $3 ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf
+ else
+ ${BACFDBIN}/bacula-fd $2 $3 ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf
+ fi
}
;;
stop)
# Stop the FD first so that SD will fail jobs and update catalog
[ -x ${BACFDBIN}/bacula-fd ] && {
- echo "Stopping the $Bacula File daemon"
- killproc ${BACFDBIN}/bacula-fd ${FD_PORT} $2
+ echo "Stopping the $Bacula File daemon"
+ killproc ${BACFDBIN}/bacula-fd ${FD_PORT} $2
}
;;
diff --git a/scripts/bacula-ctl-sd.in b/scripts/bacula-ctl-sd.in
index 3f5543b..f545cd6 100644
--- a/scripts/bacula-ctl-sd.in
+++ b/scripts/bacula-ctl-sd.in
@@ -2,8 +2,7 @@
#
# Bacula(R) - The Network Backup Solution
#
-# Copyright (C) 2000-2015 Kern Sibbald
-# Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+# Copyright (C) 2000-2016 Kern Sibbald
#
# The original author of Bacula is Kern Sibbald, with contributions
# from many others, a complete list can be found in the file AUTHORS.
@@ -19,7 +18,7 @@
# Bacula(R) is a registered trademark of Kern Sibbald.
#
# bacula-ctl-sd This shell script takes care of starting and stopping
-# the bacula Storage daemon
+# the bacula Storage daemon
#
# This is pretty much watered down version of the RedHat script
# that works on Solaris as well as Linux, but it won't work everywhere.
@@ -50,7 +49,7 @@ SD_PORT=@sd_port@
SD_USER=@sd_user@
SD_GROUP=@sd_group@
Bacula="@BACULA@"
-PIDOF=@PIDOF@
+PIDOF=@PIDOF@
# A function to stop a program.
killproc() {
@@ -79,31 +78,31 @@ killproc() {
# Kill it.
if [ "$pid" != "" ] ; then
if [ "$notset" = "1" ] ; then
- if ${PS} -p "$pid">/dev/null 2>&1; then
- # TERM first, then KILL if not dead
- kill -TERM $pid 2>/dev/null
- sleep 1
- if ${PS} -p "$pid" >/dev/null 2>&1 ; then
- sleep 1
- if ${PS} -p "$pid" >/dev/null 2>&1 ; then
- sleep 3
- if ${PS} -p "$pid" >/dev/null 2>&1 ; then
- kill -KILL $pid 2>/dev/null
- fi
- fi
- fi
- fi
- ${PS} -p "$pid" >/dev/null 2>&1
- RC=$?
- [ $RC -eq 0 ] && failure "$base shutdown" || success "$base shutdown"
+ if ${PS} -p "$pid">/dev/null 2>&1; then
+ # TERM first, then KILL if not dead
+ kill -TERM $pid 2>/dev/null
+ sleep 1
+ if ${PS} -p "$pid" >/dev/null 2>&1 ; then
+ sleep 1
+ if ${PS} -p "$pid" >/dev/null 2>&1 ; then
+ sleep 3
+ if ${PS} -p "$pid" >/dev/null 2>&1 ; then
+ kill -KILL $pid 2>/dev/null
+ fi
+ fi
+ fi
+ fi
+ ${PS} -p "$pid" >/dev/null 2>&1
+ RC=$?
+ [ $RC -eq 0 ] && failure "$base shutdown" || success "$base shutdown"
# RC=$((! $RC))
# use specified level only
else
- if ${PS} -p "$pid" >/dev/null 2>&1; then
- kill $killlevel $pid 2>/dev/null
- RC=$?
- [ $RC -eq 0 ] && success "$base $killlevel" || failure "$base $killlevel"
- fi
+ if ${PS} -p "$pid" >/dev/null 2>&1; then
+ kill $killlevel $pid 2>/dev/null
+ RC=$?
+ [ $RC -eq 0 ] && success "$base $killlevel" || failure "$base $killlevel"
+ fi
fi
else
failure "$base shutdown"
@@ -131,8 +130,8 @@ pidofproc() {
if [ -f ${PIDDIR}/$base.$2.pid ] ; then
pid=`head -n 1 ${PIDDIR}/$base.$2.pid`
if [ "$pid" != "" ] ; then
- echo $pid
- return 0
+ echo $pid
+ return 0
fi
fi
@@ -171,12 +170,12 @@ status() {
return 0
else
pid=`${PSCMD} | ${AWK} 'BEGIN { prog=ARGV[1]; ARGC=1 }
- { if ((prog == $2) || (("(" prog ")") == $2) ||
- (("[" prog "]") == $2) ||
- ((prog ":") == $2)) { print $1 ; exit 0 } }' $1`
+ { if ((prog == $2) || (("(" prog ")") == $2) ||
+ (("[" prog "]") == $2) ||
+ ((prog ":") == $2)) { print $1 ; exit 0 } }' $1`
if [ "$pid" != "" ] ; then
- echo "$base (pid $pid) is running..."
- return 0
+ echo "$base (pid $pid) is running..."
+ return 0
fi
fi
@@ -184,8 +183,8 @@ status() {
if [ -f ${PIDDIR}/$base.$2.pid ] ; then
pid=`head -n 1 ${PIDDIR}/$base.$2.pid`
if [ "$pid" != "" ] ; then
- echo "$base dead but pid file exists"
- return 1
+ echo "$base dead but pid file exists"
+ return 1
fi
fi
# See if the subsys lock exists
@@ -216,29 +215,29 @@ fi
case "$1" in
start)
[ -x ${BACSDBIN}/bacula-sd ] && {
- echo "Starting the $Bacula Storage daemon"
- OPTIONS=''
- if [ "${SD_USER}" != '' ]; then
- OPTIONS="${OPTIONS} -u ${SD_USER}"
- fi
+ echo "Starting the $Bacula Storage daemon"
+ OPTIONS=''
+ if [ "${SD_USER}" != '' ]; then
+ OPTIONS="${OPTIONS} -u ${SD_USER}"
+ fi
- if [ "${SD_GROUP}" != '' ]; then
- OPTIONS="${OPTIONS} -g ${SD_GROUP}"
- fi
+ if [ "${SD_GROUP}" != '' ]; then
+ OPTIONS="${OPTIONS} -g ${SD_GROUP}"
+ fi
- if [ "x${VALGRIND_SD}" = "x1" ]; then
- valgrind --leak-check=full ${BACSDBIN}/bacula-sd $2 $3 ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf
- else
- ${BACSDBIN}/bacula-sd $2 $3 ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf
- fi
+ if [ "x${VALGRIND_SD}" = "x1" ]; then
+ valgrind --leak-check=full ${BACSDBIN}/bacula-sd $2 $3 ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf
+ else
+ ${BACSDBIN}/bacula-sd $2 $3 ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf
+ fi
}
;;
stop)
[ -x ${BACSDBIN}/bacula-sd ] && {
- echo "Stopping the $Bacula Storage daemon"
- killproc ${BACSDBIN}/bacula-sd ${SD_PORT} $2
+ echo "Stopping the $Bacula Storage daemon"
+ killproc ${BACSDBIN}/bacula-sd ${SD_PORT} $2
}
;;
diff --git a/scripts/bacula.in b/scripts/bacula.in
index 34adcfc..cadfa65 100755
--- a/scripts/bacula.in
+++ b/scripts/bacula.in
@@ -2,8 +2,7 @@
#
# Bacula(R) - The Network Backup Solution
#
-# Copyright (C) 2000-2015 Kern Sibbald
-# Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+# Copyright (C) 2000-2016 Kern Sibbald
#
# The original author of Bacula is Kern Sibbald, with contributions
# from many others, a complete list can be found in the file AUTHORS.
@@ -19,7 +18,7 @@
# Bacula(R) is a registered trademark of Kern Sibbald.
#
# bacula This shell script takes care of starting and stopping
-# the bacula daemons.
+# the bacula daemons.
#
# This is pretty much watered down version of the RedHat script
# that works on Solaris as well as Linux, but it won't work everywhere.
diff --git a/scripts/bconsole.in b/scripts/bconsole.in
index f711fcf..f696ba1 100755
--- a/scripts/bconsole.in
+++ b/scripts/bconsole.in
@@ -2,8 +2,7 @@
#
# Bacula(R) - The Network Backup Solution
#
-# Copyright (C) 2000-2015 Kern Sibbald
-# Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+# Copyright (C) 2000-2016 Kern Sibbald
#
# The original author of Bacula is Kern Sibbald, with contributions
# from many others, a complete list can be found in the file AUTHORS.
diff --git a/scripts/breload.in b/scripts/breload.in
index 958acad..a571f96 100644
--- a/scripts/breload.in
+++ b/scripts/breload.in
@@ -2,7 +2,7 @@
#
# Bacula(R) - The Network Backup Solution
#
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
#
# The original author of Bacula is Kern Sibbald, with contributions
# from many others, a complete list can be found in the file AUTHORS.
diff --git a/scripts/btraceback.in b/scripts/btraceback.in
index 1b21954..269cc7e 100755
--- a/scripts/btraceback.in
+++ b/scripts/btraceback.in
@@ -2,7 +2,7 @@
#
# Bacula(R) - The Network Backup Solution
#
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
# Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
#
# The original author of Bacula is Kern Sibbald, with contributions
diff --git a/scripts/devel_bacula.in b/scripts/devel_bacula.in
index da0f675..53e36c1 100755
--- a/scripts/devel_bacula.in
+++ b/scripts/devel_bacula.in
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
# License: BSD 2-Clause; see file LICENSE-FOSS
#
# bacula This shell script takes care of starting and stopping
diff --git a/scripts/disk-changer.in b/scripts/disk-changer.in
index 9627bad..cf5a973 100644
--- a/scripts/disk-changer.in
+++ b/scripts/disk-changer.in
@@ -6,8 +6,7 @@
#
# Bacula(R) - The Network Backup Solution
#
-# Copyright (C) 2000-2015 Kern Sibbald
-# Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+# Copyright (C) 2000-2016 Kern Sibbald
#
# The original author of Bacula is Kern Sibbald, with contributions
# from many others, a complete list can be found in the file AUTHORS.
@@ -31,7 +30,7 @@
# included.
#
# disk-changer "changer-device" "command" "slot" "archive-device" "drive-index" "volume"
-# $1 $2 $3 $4 $5 $6
+# $1 $2 $3 $4 $5 $6
#
# By default the autochanger has 10 Volumes and 1 Drive.
#
@@ -41,8 +40,8 @@
#
# changer-device is the name of a file that overrides the default
# volumes and drives. It may have:
-# maxslot=n where n is one based (default 10)
-# maxdrive=m where m is zero based (default 1 -- i.e. 2 drives)
+# maxslot=n where n is one based (default 10)
+# maxdrive=m where m is zero based (default 1 -- i.e. 2 drives)
#
# This code can also simulate barcodes. You simply put
# a list of the slots and barcodes in the "base" directory/barcodes.
@@ -86,7 +85,7 @@ wd=@working_dir@
dbgfile="$wd/disk-changer.log"
debug() {
if test -f $dbgfile; then
- echo "`date +\"%Y%m%d-%H:%M:%S\"` $*" >> $dbgfile
+ echo "`date +\"%Y%m%d-%H:%M:%S\"` $*" >> $dbgfile
fi
}
@@ -99,8 +98,8 @@ make_temp_file() {
if test x${TMPFILE} = x; then
TMPFILE="$wd/disk-changer.$$"
if test -f ${TMPFILE}; then
- echo "Temp file security problem on: ${TMPFILE}"
- exit 1
+ echo "Temp file security problem on: ${TMPFILE}"
+ exit 1
fi
fi
}
@@ -111,14 +110,14 @@ check_parm_count() {
pCount=$1
pCountNeed=$2
if test $pCount -lt $pCountNeed; then
- echo "usage: disk-changer ctl-device command [slot archive-device drive-index]"
- echo " Insufficient number of arguments arguments given."
- if test $pCount -lt 2; then
- echo " Mimimum usage is first two arguments ..."
- else
- echo " Command expected $pCountNeed arguments"
- fi
- exit 1
+ echo "usage: disk-changer ctl-device command [slot archive-device drive-index]"
+ echo " Insufficient number of arguments arguments given."
+ if test $pCount -lt 2; then
+ echo " Mimimum usage is first two arguments ..."
+ else
+ echo " Command expected $pCountNeed arguments"
+ fi
+ exit 1
fi
}
@@ -131,7 +130,7 @@ get_dir() {
dir=`echo "$device" | sed -e s%/$bn%%g`
if [ ! -d $dir ]; then
echo "ERROR: Autochanger directory \"$dir\" does not exist."
- echo " You must create it."
+ echo " You must create it."
exit 1
fi
}
@@ -178,32 +177,32 @@ fi
#
case $2 in
list|listall)
- check_parm_count $# 2
- ;;
+ check_parm_count $# 2
+ ;;
slots)
- check_parm_count $# 2
- ;;
+ check_parm_count $# 2
+ ;;
transfer)
- check_parm_count $# 4
- if [ $slot -gt $maxslot ]; then
- echo "Slot ($slot) out of range (1-$maxslot)"
- debug "Error: Slot ($slot) out of range (1-$maxslot)"
- exit 1
- fi
- ;;
+ check_parm_count $# 4
+ if [ $slot -gt $maxslot ]; then
+ echo "Slot ($slot) out of range (1-$maxslot)"
+ debug "Error: Slot ($slot) out of range (1-$maxslot)"
+ exit 1
+ fi
+ ;;
*)
- check_parm_count $# 5
- if [ $drive -gt $maxdrive ]; then
- echo "Drive ($drive) out of range (0-$maxdrive)"
- debug "Error: Drive ($drive) out of range (0-$maxdrive)"
- exit 1
- fi
- if [ $slot -gt $maxslot ]; then
- echo "Slot ($slot) out of range (1-$maxslot)"
- debug "Error: Slot ($slot) out of range (1-$maxslot)"
- exit 1
- fi
- ;;
+ check_parm_count $# 5
+ if [ $drive -gt $maxdrive ]; then
+ echo "Drive ($drive) out of range (0-$maxdrive)"
+ debug "Error: Drive ($drive) out of range (0-$maxdrive)"
+ exit 1
+ fi
+ if [ $slot -gt $maxslot ]; then
+ echo "Slot ($slot) out of range (1-$maxslot)"
+ debug "Error: Slot ($slot) out of range (1-$maxslot)"
+ exit 1
+ fi
+ ;;
esac
@@ -214,21 +213,21 @@ case $cmd in
debug "Doing disk -f $ctl unload $slot $device $drive $volume"
get_dir
if [ -f $dir/loaded${drive} ]; then
- ld=`cat $dir/loaded${drive}`
+ ld=`cat $dir/loaded${drive}`
else
- echo "Storage Element $slot is Already Full"
- debug "Unload error: $dir/loaded${drive} is already unloaded"
- exit 1
+ echo "Storage Element $slot is Already Full"
+ debug "Unload error: $dir/loaded${drive} is already unloaded"
+ exit 1
fi
if [ $slot -eq $ld ]; then
- echo "0" >$dir/loaded${drive}
- unlink $device 2>/dev/null >/dev/null
- unlink ${device}.add 2>/dev/null >/dev/null
- rm -f ${device} ${device}.add
+ echo "0" >$dir/loaded${drive}
+ unlink $device 2>/dev/null >/dev/null
+ unlink ${device}.add 2>/dev/null >/dev/null
+ rm -f ${device} ${device}.add
else
- echo "Storage Element $slot is Already Full"
- debug "Unload error: $dir/loaded${drive} slot=$ld is already unloaded"
- exit 1
+ echo "Storage Element $slot is Already Full"
+ debug "Unload error: $dir/loaded${drive} slot=$ld is already unloaded"
+ exit 1
fi
;;
@@ -238,53 +237,53 @@ case $cmd in
i=0
# Check if slot already in a drive
while [ $i -le $maxdrive ]; do
- if [ -f $dir/loaded${i} ]; then
- ld=`cat $dir/loaded${i}`
- else
- ld=0
- fi
- if [ $ld -eq $slot ]; then
- echo "Drive ${i} Full (Storage element ${ld} loaded)"
- debug "Load error: Cannot load Slot=${ld} in drive=$drive. Already in drive=${i}"
- exit 1
- fi
- i=`expr $i + 1`
+ if [ -f $dir/loaded${i} ]; then
+ ld=`cat $dir/loaded${i}`
+ else
+ ld=0
+ fi
+ if [ $ld -eq $slot ]; then
+ echo "Drive ${i} Full (Storage element ${ld} loaded)"
+ debug "Load error: Cannot load Slot=${ld} in drive=$drive. Already in drive=${i}"
+ exit 1
+ fi
+ i=`expr $i + 1`
done
# Check if we have a Volume name
get_vol
if [ $havevol -eq 0 ]; then
- # check if slot exists
- if [ ! -f $dir/slot${slot} ] ; then
- echo "source Element Address $slot is Empty"
- debug "Load error: source Element Address $slot is Empty"
- exit 1
- fi
+ # check if slot exists
+ if [ ! -f $dir/slot${slot} ] ; then
+ echo "source Element Address $slot is Empty"
+ debug "Load error: source Element Address $slot is Empty"
+ exit 1
+ fi
fi
if [ -f $dir/loaded${drive} ]; then
- ld=`cat $dir/loaded${drive}`
+ ld=`cat $dir/loaded${drive}`
else
- ld=0
+ ld=0
fi
if [ $ld -ne 0 ]; then
- echo "Drive ${drive} Full (Storage element ${ld} loaded)"
- echo "Load error: Drive ${drive} Full (Storage element ${ld} loaded)"
- exit 1
+ echo "Drive ${drive} Full (Storage element ${ld} loaded)"
+ echo "Load error: Drive ${drive} Full (Storage element ${ld} loaded)"
+ exit 1
fi
echo "0" >$dir/loaded${drive}
unlink $device 2>/dev/null >/dev/null
unlink ${device}.add 2>/dev/null >/dev/null
rm -f ${device} ${device}.add
if [ $havevol -ne 0 ]; then
- ln -s $dir/$volume $device
- ln -s $dir/${volume}.add ${device}.add
- rtn=$?
+ ln -s $dir/$volume $device
+ ln -s $dir/${volume}.add ${device}.add
+ rtn=$?
else
- ln -s $dir/slot${slot} $device
- ln -s $dir/slot${slot}.add ${device}.add
- rtn=$?
+ ln -s $dir/slot${slot} $device
+ ln -s $dir/slot${slot}.add ${device}.add
+ rtn=$?
fi
if [ $rtn -eq 0 ]; then
- echo $slot >$dir/loaded${drive}
+ echo $slot >$dir/loaded${drive}
fi
exit $rtn
;;
@@ -293,20 +292,20 @@ case $cmd in
debug "Doing disk -f $ctl -- to list volumes"
get_dir
if [ -f $dir/barcodes ]; then
- cat $dir/barcodes
+ cat $dir/barcodes
else
- i=1
- while [ $i -le $maxslot ]; do
- slot=$i
- volume=
- get_vol
- if [ $havevol -eq 0 ]; then
- echo "$i:"
- else
- echo "$i:$volume"
- fi
- i=`expr $i + 1`
- done
+ i=1
+ while [ $i -le $maxslot ]; do
+ slot=$i
+ volume=
+ get_vol
+ if [ $havevol -eq 0 ]; then
+ echo "$i:"
+ else
+ echo "$i:$volume"
+ fi
+ i=`expr $i + 1`
+ done
fi
exit 0
;;
@@ -317,20 +316,20 @@ case $cmd in
debug "Doing disk -f $ctl -- to list volumes"
get_dir
if [ ! -f $dir/barcodes ]; then
- exit 0
+ exit 0
fi
# we print drive content seen by autochanger
# and we also remove loaded media from the barcode list
i=0
while [ $i -le $maxdrive ]; do
- if [ -f $dir/loaded${i} ]; then
- ld=`cat $dir/loaded${i}`
- v=`awk -F: "/^$ld:/"' { print $2 }' $dir/barcodes`
- echo "D:$i:F:$ld:$v"
- echo "^$ld:" >> $TMPFILE
- fi
- i=`expr $i + 1`
+ if [ -f $dir/loaded${i} ]; then
+ ld=`cat $dir/loaded${i}`
+ v=`awk -F: "/^$ld:/"' { print $2 }' $dir/barcodes`
+ echo "D:$i:F:$ld:$v"
+ echo "^$ld:" >> $TMPFILE
+ fi
+ i=`expr $i + 1`
done
# Empty slots are not in barcodes file
@@ -339,15 +338,15 @@ case $cmd in
grep -v -f $TMPFILE $dir/barcodes | sort -n | \
perl -ne 'BEGIN { $cur=1 }
if (/(\d+):(.+)?/) {
- if ($cur == $1) {
- print "S:$1:F:$2\n"
- } else {
- while ($cur < $1) {
- print "S:$cur:E\n";
- $cur++;
- }
- }
- $cur++;
+ if ($cur == $1) {
+ print "S:$1:F:$2\n"
+ } else {
+ while ($cur < $1) {
+ print "S:$cur:E\n";
+ $cur++;
+ }
+ }
+ $cur++;
}
END { while ($cur < '"$maxslot"') { print "S:$cur:E\n"; $cur++; } } '
@@ -360,12 +359,12 @@ case $cmd in
make_temp_file
slotdest=$device
if [ -f $dir/slot{$slotdest} ]; then
- echo "destination Element Address $slot is Full"
- exit 1
+ echo "destination Element Address $slot is Full"
+ exit 1
fi
if [ ! -f $dir/slot${slot} ] ; then
- echo "source Element Address $slot is Empty"
- exit 1
+ echo "source Element Address $slot is Empty"
+ exit 1
fi
echo "Transfering $slot to $slotdest"
@@ -373,8 +372,8 @@ case $cmd in
mv $dir/slot${slot}.add $dir/slot{$slotdest}.add
if [ -f $dir/barcodes ]; then
- sed "s/^$slot:/$slotdest:/" > $TMPFILE
- sort -n $TMPFILE > $dir/barcodes
+ sed "s/^$slot:/$slotdest:/" > $TMPFILE
+ sort -n $TMPFILE > $dir/barcodes
fi
exit 0
;;
@@ -382,9 +381,9 @@ case $cmd in
debug "Doing disk -f $ctl $drive -- to find what is loaded"
get_dir
if [ -f $dir/loaded${drive} ]; then
- a=`cat $dir/loaded${drive}`
+ a=`cat $dir/loaded${drive}`
else
- a="0"
+ a="0"
fi
debug "Loaded: drive=$drive is $a"
echo $a
diff --git a/scripts/dvd-handler.in b/scripts/dvd-handler.in
index e8492ae..2d2bcf1 100644
--- a/scripts/dvd-handler.in
+++ b/scripts/dvd-handler.in
@@ -2,8 +2,7 @@
#
# Bacula(R) - The Network Backup Solution
#
-# Copyright (C) 2000-2015 Kern Sibbald
-# Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+# Copyright (C) 2000-2016 Kern Sibbald
#
# The original author of Bacula is Kern Sibbald, with contributions
# from many others, a complete list can be found in the file AUTHORS.
@@ -27,30 +26,30 @@
# operations used by Bacula:
#
# free (no arguments)
-# Scan the device and report the available space. It returns:
-# Prints on the first output line the free space available in bytes.
-# If an error occurs, prints a negative number (-errno), followed,
-# on the second line, by an error message.
+# Scan the device and report the available space. It returns:
+# Prints on the first output line the free space available in bytes.
+# If an error occurs, prints a negative number (-errno), followed,
+# on the second line, by an error message.
#
# write op filename
-# Write a part file to disk.
-# This operation needs two additional arguments.
-# The first (op) indicates to
-# 0 -- append
-# 1 -- first write to a blank disk
-# 2 -- blank or truncate a disk
+# Write a part file to disk.
+# This operation needs two additional arguments.
+# The first (op) indicates to
+# 0 -- append
+# 1 -- first write to a blank disk
+# 2 -- blank or truncate a disk
#
-# The second is the filename to write
+# The second is the filename to write
#
# operations available but not used by Bacula:
#
# test Scan the device and report the information found.
-# This operation needs no further arguments.
+# This operation needs no further arguments.
# prepare Prepare a DVD+/-RW for being used by Bacula.
-# Note: This is only useful if you already have some
-# non-Bacula data on a medium, and you want to use
-# it with Bacula. Don't run this on blank media, it
-# is useless.
+# Note: This is only useful if you already have some
+# non-Bacula data on a medium, and you want to use
+# it with Bacula. Don't run this on blank media, it
+# is useless.
#
#
# $Id$
@@ -90,23 +89,23 @@ class disk:
# dvd-writepart doesn't not always need to know the free space).
#
# The following methods are implemented:
-# __init__ we need that...
-# __repr__ this seems to be a good idea to have.
-# Quite minimalistic implementation, though.
-# __str__ For casts to string. Return the current disk information
-# is_empty Returns TRUE if the disk is empty, blank... this needs more
-# work, especially concerning non-RW media and blank vs. no
-# filesystem considerations. Here, we should also look for
-# other filesystems - probably we don't want to silently
-# overwrite UDF or ext2 or anything not mentioned in fstab...
-# (NB: I don't think it is a problem)
-# free Returns the available free space.
-# write Writes one part file to disk, either starting a new file
-# system on disk, or appending to it.
-# This method should also prepare a blank disk so that a
-# certain part of the disk is used to allow detection of a
-# used disk by all / more disk drives.
-# prepare Blank the device
+# __init__ we need that...
+# __repr__ this seems to be a good idea to have.
+# Quite minimalistic implementation, though.
+# __str__ For casts to string. Return the current disk information
+# is_empty Returns TRUE if the disk is empty, blank... this needs more
+# work, especially concerning non-RW media and blank vs. no
+# filesystem considerations. Here, we should also look for
+# other filesystems - probably we don't want to silently
+# overwrite UDF or ext2 or anything not mentioned in fstab...
+# (NB: I don't think it is a problem)
+# free Returns the available free space.
+# write Writes one part file to disk, either starting a new file
+# system on disk, or appending to it.
+# This method should also prepare a blank disk so that a
+# certain part of the disk is used to allow detection of a
+# used disk by all / more disk drives.
+# prepare Blank the device
#
###############################################################################
def __init__(self, devicename):
@@ -125,10 +124,10 @@ class disk:
self.growcmd += " -quiet"
if self.is4gbsupported():
- self.growcmd += " -use-the-force-luke=4gms"
+ self.growcmd += " -use-the-force-luke=4gms"
self.growparams = " -A 'Bacula Data' -input-charset=default -iso-level 3 -pad " + \
- "-p 'dvd-handler / growisofs' -sysid 'BACULADATA' -R"
+ "-p 'dvd-handler / growisofs' -sysid 'BACULADATA' -R"
return
@@ -137,9 +136,9 @@ class disk:
def __str__(self):
if not self.freespace_collected:
- self.collect_freespace();
+ self.collect_freespace();
if not self.mediumtype_collected:
- self.collect_mediumtype();
+ self.collect_mediumtype();
self.me = "Class disk, initialized with device '" + self.device + "'\n"
self.me += "type = '" + self.disktype + "' mode='" + self.diskmode + "' status = '" + self.diskstatus + "'\n"
@@ -153,47 +152,47 @@ class disk:
processi = popen2.Popen4("uname -s -r")
status = processi.wait()
if not os.WIFEXITED(status):
- return 1
+ return 1
if os.WEXITSTATUS(status) != 0:
- return 1
+ return 1
strres = processi.fromchild.readline()[0:-1]
version = re.search(r"Linux (\d+)\.(\d+)\.(\d+)", strres)
if not version: # Non-Linux: allow
- return 1
+ return 1
if (int(version.group(1)) > 2) or (int(version.group(2)) > 6) or ((int(version.group(1)) == 2) and (int(version.group(2)) == 6) and (int(version.group(3)) >= 8)):
- return 1
+ return 1
else:
- return 0
+ return 0
def collect_freespace(self): # Collects current free space
self.cmd = self.growcmd + " -F " + self.device
processi = popen2.Popen4(self.cmd)
status = processi.wait()
if not os.WIFEXITED(status):
- raise DVDError(0, "growisofs process did not exit correctly.")
+ raise DVDError(0, "growisofs process did not exit correctly.")
result = processi.fromchild.read()
if os.WEXITSTATUS(status) != 0:
- if (os.WEXITSTATUS(status) & 0x7F) == errno.ENOSPC:
- # Kludge to force dvd-handler to return a free space of 0
- self.next_session = 1
- self.capacity = 1
- self.freespace_collected = 1
- return
- else:
- raise DVDError(os.WEXITSTATUS(status), "growisofs returned with an error " + result + ". Please check your are using a patched version of dvd+rw-tools.")
+ if (os.WEXITSTATUS(status) & 0x7F) == errno.ENOSPC:
+ # Kludge to force dvd-handler to return a free space of 0
+ self.next_session = 1
+ self.capacity = 1
+ self.freespace_collected = 1
+ return
+ else:
+ raise DVDError(os.WEXITSTATUS(status), "growisofs returned with an error " + result + ". Please check your are using a patched version of dvd+rw-tools.")
next_sess = re.search(r"\snext_session=(\d+)\s", result, re.MULTILINE)
capa = re.search(r"\scapacity=(\d+)\s", result, re.MULTILINE)
if next_sess and capa:
- self.next_session = long(next_sess.group(1))
- self.capacity = long(capa.group(1))
-
- # testing cheat (emulate 4GB boundary at 100MB)
- #if self.next_session > 100000000:
- # self.capacity = self.next_session
+ self.next_session = long(next_sess.group(1))
+ self.capacity = long(capa.group(1))
+
+ # testing cheat (emulate 4GB boundary at 100MB)
+ #if self.next_session > 100000000:
+ # self.capacity = self.next_session
else:
- raise DVDError(0, "Cannot get next_session and capacity from growisofs.\nReturned: " + result)
+ raise DVDError(0, "Cannot get next_session and capacity from growisofs.\nReturned: " + result)
self.freespace_collected = 1
return
@@ -204,10 +203,10 @@ class disk:
processi = popen2.Popen4(cmd)
status = processi.wait()
if not os.WIFEXITED(status):
- raise DVDError(0, self.dvdrwmediainfo + " process did not exit correctly.")
+ raise DVDError(0, self.dvdrwmediainfo + " process did not exit correctly.")
if os.WEXITSTATUS(status) != 0:
- raise DVDError(0, "Cannot get media info from " + self.dvdrwmediainfo)
- return
+ raise DVDError(0, "Cannot get media info from " + self.dvdrwmediainfo)
+ return
result = processi.fromchild.read()
hardware = re.search(r"INQUIRY:\s+(.*)\n", result, re.MULTILINE)
@@ -216,23 +215,23 @@ class disk:
status = re.search(r"\sDisc status:\s+(.*)\n", result, re.MULTILINE)
if hardware:
- self.hardwaredevice = hardware.group(1)
+ self.hardwaredevice = hardware.group(1)
if mediatype:
- self.disktype = mediatype.group(2)
+ self.disktype = mediatype.group(2)
else:
- raise DVDError(0, "Media type not found in " + self.dvdrwmediainfo + " output")
+ raise DVDError(0, "Media type not found in " + self.dvdrwmediainfo + " output")
if self.disktype == "DVD-RW":
- if mediamode:
- self.diskmode = mediamode.group(1)
- else:
- raise DVDError(0, "Media mode not found for DVD-RW in " + self.dvdrwmediainfo + " output")
+ if mediamode:
+ self.diskmode = mediamode.group(1)
+ else:
+ raise DVDError(0, "Media mode not found for DVD-RW in " + self.dvdrwmediainfo + " output")
if status:
- self.diskstatus = status.group(1)
+ self.diskstatus = status.group(1)
else:
- raise DVDError(0, "Disc status not found in " + self.dvdrwmediainfo + " output")
+ raise DVDError(0, "Disc status not found in " + self.dvdrwmediainfo + " output")
self.mediumtype_collected = 1
@@ -240,76 +239,76 @@ class disk:
def is_empty(self):
if not self.freespace_collected:
- self.collect_freespace();
+ self.collect_freespace();
return 0 == self.next_session
def is_RW(self):
if not self.mediumtype_collected:
- self.collect_mediumtype();
+ self.collect_mediumtype();
return "DVD-RW" == self.disktype or "DVD+RW" == self.disktype or "DVD-RAM" == self.disktype
def is_plus_RW(self):
if not self.mediumtype_collected:
- self.collect_mediumtype();
+ self.collect_mediumtype();
return "DVD+RW" == self.disktype
def is_minus_RW(self):
if not self.mediumtype_collected:
- self.collect_mediumtype();
+ self.collect_mediumtype();
return "DVD-RW" == self.disktype
def is_restricted_overwrite(self):
if not self.mediumtype_collected:
- self.collect_mediumtype();
+ self.collect_mediumtype();
return self.diskmode == "Restricted Overwrite"
def is_blank(self):
if not self.mediumtype_collected:
- self.collect_mediumtype();
+ self.collect_mediumtype();
return self.diskstatus == "blank"
def free(self):
if not self.freespace_collected:
- self.collect_freespace();
+ self.collect_freespace();
fr = self.capacity-self.next_session-self.margin
if fr < 0:
- return 0
+ return 0
else:
- return fr
+ return fr
def term_handler(self, signum, frame):
print 'dvd-handler: Signal term_handler called with signal', signum
if self.pid != 0:
- print "dvd-handler: Sending SIGTERM to pid", self.pid
- os.kill(self.pid, signal.SIGTERM)
- time.sleep(10)
- print "dvd-handler: Sending SIGKILL to pid", self.pid
- os.kill(self.pid, signal.SIGKILL)
- sys.exit(1)
+ print "dvd-handler: Sending SIGTERM to pid", self.pid
+ os.kill(self.pid, signal.SIGTERM)
+ time.sleep(10)
+ print "dvd-handler: Sending SIGKILL to pid", self.pid
+ os.kill(self.pid, signal.SIGKILL)
+ sys.exit(1)
def write(self, newvol, partfile):
# Blank DVD+RW when there is no data on it
if newvol and self.is_plus_RW() and self.is_blank():
- print "DVD+RW looks brand-new, blank it to fix some DVD-writers bugs."
- self.blank()
- print "Done, now writing the part file."
+ print "DVD+RW looks brand-new, blank it to fix some DVD-writers bugs."
+ self.blank()
+ print "Done, now writing the part file."
if newvol and self.is_minus_RW() and (not self.is_restricted_overwrite()):
- print "DVD-RW is in " + self.diskmode + " mode, reformating it to Restricted Overwrite"
- self.reformat_minus_RW()
- print "Done, now writing the part file."
+ print "DVD-RW is in " + self.diskmode + " mode, reformating it to Restricted Overwrite"
+ self.reformat_minus_RW()
+ print "Done, now writing the part file."
cmd = self.growcmd + self.growparams
if newvol:
- # Ignore any existing iso9660 filesystem - used for truncate
- if newvol == 2:
- cmd += " -use-the-force-luke=tty"
- cmd += " -Z "
+ # Ignore any existing iso9660 filesystem - used for truncate
+ if newvol == 2:
+ cmd += " -use-the-force-luke=tty"
+ cmd += " -Z "
else:
- cmd += " -M "
+ cmd += " -M "
cmd += self.device + " " + str(partfile)
print "Running " + cmd
oldsig = signal.signal(signal.SIGTERM, self.term_handler)
@@ -317,40 +316,40 @@ class disk:
self.pid = proc.pid
status = proc.poll()
while status == -1:
- line = proc.fromchild.readline()
- while len(line) > 0:
- print line,
- line = proc.fromchild.readline()
- time.sleep(1)
- status = proc.poll()
+ line = proc.fromchild.readline()
+ while len(line) > 0:
+ print line,
+ line = proc.fromchild.readline()
+ time.sleep(1)
+ status = proc.poll()
self.pid = 0
print
signal.signal(signal.SIGTERM, oldsig)
if not os.WIFEXITED(status):
- raise DVDError(0, cmd + " process did not exit correctly, signal/status " + str(status))
+ raise DVDError(0, cmd + " process did not exit correctly, signal/status " + str(status))
if os.WEXITSTATUS(status) != 0:
- raise DVDError(os.WEXITSTATUS(status), cmd + " exited with status " + str(os.WEXITSTATUS(status)) + ", signal/status " + str(status))
+ raise DVDError(os.WEXITSTATUS(status), cmd + " exited with status " + str(os.WEXITSTATUS(status)) + ", signal/status " + str(status))
def prepare(self):
if not self.is_RW():
- raise DVDError(0, "I won't prepare a non-rewritable medium")
+ raise DVDError(0, "I won't prepare a non-rewritable medium")
# Blank DVD+RW when there is no data on it
if self.is_plus_RW() and self.is_blank():
- print "DVD+RW looks brand-new, blank it to fix some DVD-writers bugs."
- self.blank()
- return # It has been completely blanked: Medium is ready to be used by Bacula
+ print "DVD+RW looks brand-new, blank it to fix some DVD-writers bugs."
+ self.blank()
+ return # It has been completely blanked: Medium is ready to be used by Bacula
if self.is_minus_RW() and (not self.is_restricted_overwrite()):
- print "DVD-RW is in " + self.diskmode + " mode, reformating it to Restricted Overwrite"
- self.reformat_minus_RW()
- return # Reformated: Medium is ready to be used by Bacula
+ print "DVD-RW is in " + self.diskmode + " mode, reformating it to Restricted Overwrite"
+ self.reformat_minus_RW()
+ return # Reformated: Medium is ready to be used by Bacula
# TODO: Check if /dev/fd/0 and /dev/zero exists, otherwise, run self.blank()
if not os.path.exists("/dev/fd/0") or not os.path.exists("/dev/zero"):
- print "/dev/fd/0 or /dev/zero doesn't exist, blank the medium completely."
- self.blank()
- return
+ print "/dev/fd/0 or /dev/zero doesn't exist, blank the medium completely."
+ self.blank()
+ return
cmd = self.dd + " if=/dev/zero bs=1024 count=512 | " + self.growcmd + " -Z " + self.device + "=/dev/fd/0"
print "Running " + cmd
@@ -359,17 +358,17 @@ class disk:
self.pid = proc.pid
status = proc.poll()
while status == -1:
- line = proc.fromchild.readline()
- while len(line) > 0:
- print line,
- line = proc.fromchild.readline()
- time.sleep(1)
- status = proc.poll()
+ line = proc.fromchild.readline()
+ while len(line) > 0:
+ print line,
+ line = proc.fromchild.readline()
+ time.sleep(1)
+ status = proc.poll()
self.pid = 0
print
signal.signal(signal.SIGTERM, oldsig)
if os.WEXITSTATUS(status) != 0:
- raise DVDError(os.WEXITSTATUS(status), cmd + " exited with status " + str(os.WEXITSTATUS(status)) + ", signal/status " + str(status))
+ raise DVDError(os.WEXITSTATUS(status), cmd + " exited with status " + str(os.WEXITSTATUS(status)) + ", signal/status " + str(status))
def blank(self):
cmd = self.growcmd + " -Z " + self.device + "=/dev/zero"
@@ -379,17 +378,17 @@ class disk:
self.pid = proc.pid
status = proc.poll()
while status == -1:
- line = proc.fromchild.readline()
- while len(line) > 0:
- print line,
- line = proc.fromchild.readline()
- time.sleep(1)
- status = proc.poll()
+ line = proc.fromchild.readline()
+ while len(line) > 0:
+ print line,
+ line = proc.fromchild.readline()
+ time.sleep(1)
+ status = proc.poll()
self.pid = 0
print
signal.signal(signal.SIGTERM, oldsig)
if os.WEXITSTATUS(status) != 0:
- raise DVDError(os.WEXITSTATUS(status), cmd + " exited with status " + str(os.WEXITSTATUS(status)) + ", signal/status " + str(status))
+ raise DVDError(os.WEXITSTATUS(status), cmd + " exited with status " + str(os.WEXITSTATUS(status)) + ", signal/status " + str(status))
def reformat_minus_RW(self):
cmd = self.dvdrwformat + " -force " + self.device
@@ -399,17 +398,17 @@ class disk:
self.pid = proc.pid
status = proc.poll()
while status == -1:
- line = proc.fromchild.readline()
- while len(line) > 0:
- print line,
- line = proc.fromchild.readline()
- time.sleep(1)
- status = proc.poll()
+ line = proc.fromchild.readline()
+ while len(line) > 0:
+ print line,
+ line = proc.fromchild.readline()
+ time.sleep(1)
+ status = proc.poll()
self.pid = 0
print
signal.signal(signal.SIGTERM, oldsig)
if os.WEXITSTATUS(status) != 0:
- raise DVDError(os.WEXITSTATUS(status), cmd + " exited with status " + str(os.WEXITSTATUS(status)) + ", signal/status " + str(status))
+ raise DVDError(os.WEXITSTATUS(status), cmd + " exited with status " + str(os.WEXITSTATUS(status)) + ", signal/status " + str(status))
# class disk ends here.
@@ -418,7 +417,7 @@ class DVDError(Exception):
self.errno = errno
self.value = value
if self.value[-1] == '\n':
- self.value = self.value[0:-1]
+ self.value = self.value[0:-1]
def __str__(self):
return str(self.value) + " || errno = " + str(self.errno) + " (" + os.strerror(self.errno & 0x7F) + ")"
@@ -435,19 +434,19 @@ dvd-handler DEVICE prepare
where DEVICE is a device name like /dev/sr0 or /dev/dvd.
Operations:
-test Scan the device and report the information found.
- This operation needs no further arguments.
-free Scan the device and report the available space.
-write Write a part file to disk.
- This operation needs two additional arguments.
- The first indicates to append (0), restart the
- disk (1) or restart existing disk (2). The second
- is the file to write.
+test Scan the device and report the information found.
+ This operation needs no further arguments.
+free Scan the device and report the available space.
+write Write a part file to disk.
+ This operation needs two additional arguments.
+ The first indicates to append (0), restart the
+ disk (1) or restart existing disk (2). The second
+ is the file to write.
prepare Prepare a DVD+/-RW for being used by Bacula.
- Note: This is only useful if you already have some
- non-Bacula data on a medium, and you want to use
- it with Bacula. Don't run this on blank media, it
- is useless.
+ Note: This is only useful if you already have some
+ non-Bacula data on a medium, and you want to use
+ it with Bacula. Don't run this on blank media, it
+ is useless.
"""
sys.exit(1)
@@ -459,31 +458,31 @@ dvd = disk(sys.argv[1])
if "free" == sys.argv[2]:
if len(sys.argv) == 3:
try:
- free = dvd.free()
+ free = dvd.free()
except DVDError, e:
- if e.errno != 0:
- print -e.errno
- else:
- print errno.EPIPE
- print str(e)
+ if e.errno != 0:
+ print -e.errno
+ else:
+ print errno.EPIPE
+ print str(e)
else:
- print free
- print "No Error reported."
+ print free
+ print "No Error reported."
else:
print "Wrong number of arguments for free operation. Wanted 3 got", len(sys.argv)
usage()
elif "prepare" == sys.argv[2]:
if len(sys.argv) == 3:
try:
- dvd.prepare()
+ dvd.prepare()
except DVDError, e:
- print "Error while preparing medium: ", str(e)
- if e.errno != 0:
- sys.exit(e.errno & 0x7F)
- else:
- sys.exit(errno.EPIPE)
+ print "Error while preparing medium: ", str(e)
+ if e.errno != 0:
+ sys.exit(e.errno & 0x7F)
+ else:
+ sys.exit(errno.EPIPE)
else:
- print "Medium prepared successfully."
+ print "Medium prepared successfully."
else:
print "Wrong number of arguments for prepare operation. Wanted 3 got", len(sys.argv)
usage()
@@ -497,15 +496,15 @@ elif "test" == sys.argv[2]:
elif "write" == sys.argv[2]:
if len(sys.argv) == 5:
try:
- dvd.write(long(sys.argv[3]), sys.argv[4])
+ dvd.write(long(sys.argv[3]), sys.argv[4])
except DVDError, e:
- print "Error while writing part file: ", str(e)
- if e.errno != 0:
- sys.exit(e.errno & 0x7F)
- else:
- sys.exit(errno.EPIPE)
+ print "Error while writing part file: ", str(e)
+ if e.errno != 0:
+ sys.exit(e.errno & 0x7F)
+ else:
+ sys.exit(errno.EPIPE)
else:
- print "Part file " + sys.argv[4] + " successfully written to disk."
+ print "Part file " + sys.argv[4] + " successfully written to disk."
else:
print "Wrong number of arguments for write operation. Wanted 5 got", len(sys.argv)
usage()
diff --git a/scripts/dvd-simulator.in b/scripts/dvd-simulator.in
index a3033f0..75bc5d2 100644
--- a/scripts/dvd-simulator.in
+++ b/scripts/dvd-simulator.in
@@ -2,8 +2,7 @@
#
# Bacula(R) - The Network Backup Solution
#
-# Copyright (C) 2000-2015 Kern Sibbald
-# Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+# Copyright (C) 2000-2016 Kern Sibbald
#
# The original author of Bacula is Kern Sibbald, with contributions
# from many others, a complete list can be found in the file AUTHORS.
@@ -28,27 +27,27 @@
# operations used by Bacula:
#
# free (no arguments)
-# Scan the device and report the available space.
+# Scan the device and report the available space.
#
# write op filename
-# Write a part file to disk.
-# This operation needs two additional arguments.
-# The first (op) indicates to
-# 0 -- append
-# 1 -- first write to a blank disk
-# 2 -- blank or truncate a disk
+# Write a part file to disk.
+# This operation needs two additional arguments.
+# The first (op) indicates to
+# 0 -- append
+# 1 -- first write to a blank disk
+# 2 -- blank or truncate a disk
#
-# The second is the filename to write
+# The second is the filename to write
#
# operations available but not used by Bacula:
#
# test Scan the device and report the information found.
-# This operation needs no further arguments.
+# This operation needs no further arguments.
# prepare Prepare a DVD+/-RW for being used by Bacula.
-# Note: This is only useful if you already have some
-# non-Bacula data on a medium, and you want to use
-# it with Bacula. Don't run this on blank media, it
-# is useless.
+# Note: This is only useful if you already have some
+# non-Bacula data on a medium, and you want to use
+# it with Bacula. Don't run this on blank media, it
+# is useless.
#
#
# in case of operation ``free'' returns:
@@ -92,23 +91,23 @@ class disk:
# dvd-writepart doesn't not always need to know the free space).
#
# The following methods are implemented:
-# __init__ we need that...
-# __repr__ this seems to be a good idea to have.
-# Quite minimalistic implementation, though.
-# __str__ For casts to string. Return the current disk information
-# is_empty Returns TRUE if the disk is empty, blank... this needs more
-# work, especially concerning non-RW media and blank vs. no
-# filesystem considerations. Here, we should also look for
-# other filesystems - probably we don't want to silently
-# overwrite UDF or ext2 or anything not mentioned in fstab...
-# (NB: I don't think it is a problem)
-# free Returns the available free space.
-# write Writes one part file to disk, either starting a new file
-# system on disk, or appending to it.
-# This method should also prepare a blank disk so that a
-# certain part of the disk is used to allow detection of a
-# used disk by all / more disk drives.
-# blank Blank the device
+# __init__ we need that...
+# __repr__ this seems to be a good idea to have.
+# Quite minimalistic implementation, though.
+# __str__ For casts to string. Return the current disk information
+# is_empty Returns TRUE if the disk is empty, blank... this needs more
+# work, especially concerning non-RW media and blank vs. no
+# filesystem considerations. Here, we should also look for
+# other filesystems - probably we don't want to silently
+# overwrite UDF or ext2 or anything not mentioned in fstab...
+# (NB: I don't think it is a problem)
+# free Returns the available free space.
+# write Writes one part file to disk, either starting a new file
+# system on disk, or appending to it.
+# This method should also prepare a blank disk so that a
+# certain part of the disk is used to allow detection of a
+# used disk by all / more disk drives.
+# blank Blank the device
#
###############################################################################
def __init__(self, devicename):
@@ -128,10 +127,10 @@ class disk:
self.growcmd += " -quiet"
if self.is4gbsupported():
- self.growcmd += " -use-the-force-luke=4gms"
+ self.growcmd += " -use-the-force-luke=4gms"
self.growparams = " -A 'Bacula Data' -input-charset=default -iso-level 3 -pad " + \
- "-p 'dvd-handler / growisofs' -sysid 'BACULADATA' -R"
+ "-p 'dvd-handler / growisofs' -sysid 'BACULADATA' -R"
return
@@ -140,9 +139,9 @@ class disk:
def __str__(self):
if not self.freespace_collected:
- self.collect_freespace();
+ self.collect_freespace();
if not self.mediumtype_collected:
- self.collect_mediumtype();
+ self.collect_mediumtype();
self.me = "Class disk, initialized with device '" + self.device + "'\n"
self.me += "type = '" + self.disktype + "' mode='" + self.diskmode + "' status = '" + self.diskstatus + "'\n"
@@ -156,18 +155,18 @@ class disk:
processi = popen2.Popen4("uname -s -r")
status = processi.wait()
if not os.WIFEXITED(status):
- return 1
+ return 1
if os.WEXITSTATUS(status) != 0:
- return 1
+ return 1
strres = processi.fromchild.readline()[0:-1]
version = re.search(r"Linux (\d+)\.(\d+)\.(\d+)", strres)
if not version: # Non-Linux: allow
- return 1
+ return 1
if (int(version.group(1)) > 2) or (int(version.group(2)) > 6) or ((int(version.group(1)) == 2) and (int(version.group(2)) == 6) and (int(version.group(3)) >= 8)):
- return 1
+ return 1
else:
- return 0
+ return 0
def collect_freespace(self): # Collects current free space
self.next_session = 0
@@ -175,19 +174,19 @@ class disk:
self.freespace_collected = 1
cmd = "du -sb " + self.device
- processi = popen2.Popen4(cmd)
+ processi = popen2.Popen4(cmd)
status = processi.wait()
if not os.WIFEXITED(status):
- return 1;
+ return 1;
if os.WEXITSTATUS(status) != 0:
- return 1;
+ return 1;
result = processi.fromchild.read()
used = re.search(r"(\d+)\s", result, re.MULTILINE)
self.capacity = self.maxcapacity - long(used.group(1))
if self.capacity < 0:
- self.capacity = 0
+ self.capacity = 0
return 0
@@ -197,10 +196,10 @@ class disk:
processi = popen2.Popen4(cmd)
status = processi.wait()
if not os.WIFEXITED(status):
- raise DVDError(0, self.dvdrwmediainfo + " process did not exit correctly.")
+ raise DVDError(0, self.dvdrwmediainfo + " process did not exit correctly.")
if os.WEXITSTATUS(status) != 0:
- raise DVDError(0, "Cannot get media info from " + self.dvdrwmediainfo)
- return
+ raise DVDError(0, "Cannot get media info from " + self.dvdrwmediainfo)
+ return
result = processi.fromchild.read()
hardware = re.search(r"INQUIRY:\s+(.*)\n", result, re.MULTILINE)
@@ -209,23 +208,23 @@ class disk:
status = re.search(r"\sDisc status:\s+(.*)\n", result, re.MULTILINE)
if hardware:
- self.hardwaredevice = hardware.group(1)
+ self.hardwaredevice = hardware.group(1)
if mediatype:
- self.disktype = mediatype.group(2)
+ self.disktype = mediatype.group(2)
else:
- raise DVDError(0, "Media type not found in " + self.dvdrwmediainfo + " output")
+ raise DVDError(0, "Media type not found in " + self.dvdrwmediainfo + " output")
if self.disktype == "DVD-RW":
- if mediamode:
- self.diskmode = mediamode.group(1)
- else:
- raise DVDError(0, "Media mode not found for DVD-RW in " + self.dvdrwmediainfo + " output")
+ if mediamode:
+ self.diskmode = mediamode.group(1)
+ else:
+ raise DVDError(0, "Media mode not found for DVD-RW in " + self.dvdrwmediainfo + " output")
if status:
- self.diskstatus = status.group(1)
+ self.diskstatus = status.group(1)
else:
- raise DVDError(0, "Disc status not found in " + self.dvdrwmediainfo + " output")
+ raise DVDError(0, "Disc status not found in " + self.dvdrwmediainfo + " output")
self.mediumtype_collected = 1
@@ -233,84 +232,84 @@ class disk:
def is_empty(self):
if not self.freespace_collected:
- self.collect_freespace();
+ self.collect_freespace();
return 0 == self.next_session
def is_RW(self):
if not self.mediumtype_collected:
- self.collect_mediumtype();
+ self.collect_mediumtype();
return "DVD-RW" == self.disktype or "DVD+RW" == self.disktype or "DVD-RAM" == self.disktype
def is_plus_RW(self):
if not self.mediumtype_collected:
- self.collect_mediumtype();
+ self.collect_mediumtype();
return "DVD+RW" == self.disktype
def is_minus_RW(self):
if not self.mediumtype_collected:
- self.collect_mediumtype();
+ self.collect_mediumtype();
return "DVD-RW" == self.disktype
def is_restricted_overwrite(self):
if not self.mediumtype_collected:
- self.collect_mediumtype();
+ self.collect_mediumtype();
return self.diskmode == "Restricted Overwrite"
def is_blank(self):
if not self.mediumtype_collected:
- self.collect_mediumtype();
+ self.collect_mediumtype();
return self.diskstatus == "blank"
def free(self):
if not self.freespace_collected:
- self.collect_freespace();
+ self.collect_freespace();
fr = self.capacity-self.next_session-self.margin
if fr < 0:
- return 0
+ return 0
else:
- return fr
+ return fr
def term_handler(self, signum, frame):
print 'dvd-handler: Signal term_handler called with signal', signum
if self.pid != 0:
- print "dvd-handler: Sending SIGTERM to pid", self.pid
- os.kill(self.pid, signal.SIGTERM)
- time.sleep(10)
- print "dvd-handler: Sending SIGKILL to pid", self.pid
- os.kill(self.pid, signal.SIGKILL)
- sys.exit(1)
+ print "dvd-handler: Sending SIGTERM to pid", self.pid
+ os.kill(self.pid, signal.SIGTERM)
+ time.sleep(10)
+ print "dvd-handler: Sending SIGKILL to pid", self.pid
+ os.kill(self.pid, signal.SIGKILL)
+ sys.exit(1)
def write(self, newvol, partfile):
if newvol:
- print "Newvol", newvol
- print "Zap everything ..."
- os.system("rm -f "+self.device+"/*")
+ print "Newvol", newvol
+ print "Zap everything ..."
+ os.system("rm -f "+self.device+"/*")
print "cp", partfile, self.device
shutil.copy(partfile,self.device)
def prepare(self):
if not self.is_RW():
- raise DVDError(0, "I won't prepare a non-rewritable medium")
+ raise DVDError(0, "I won't prepare a non-rewritable medium")
# Blank DVD+RW when there is no data on it
if self.is_plus_RW() and self.is_blank():
- print "DVD+RW looks brand-new, blank it to fix some DVD-writers bugs."
- self.blank()
- return # It has been completely blanked: Medium is ready to be used by Bacula
+ print "DVD+RW looks brand-new, blank it to fix some DVD-writers bugs."
+ self.blank()
+ return # It has been completely blanked: Medium is ready to be used by Bacula
if self.is_minus_RW() and (not self.is_restricted_overwrite()):
- print "DVD-RW is in " + self.diskmode + " mode, reformating it to Restricted Overwrite"
- self.reformat_minus_RW()
- return # Reformated: Medium is ready to be used by Bacula
+ print "DVD-RW is in " + self.diskmode + " mode, reformating it to Restricted Overwrite"
+ self.reformat_minus_RW()
+ return # Reformated: Medium is ready to be used by Bacula
# TODO: Check if /dev/fd/0 and /dev/zero exists, otherwise, run self.blank()
if not os.path.exists("/dev/fd/0") or not os.path.exists("/dev/zero"):
- print "/dev/fd/0 or /dev/zero doesn't exist, blank the medium completely."
- self.blank()
- return
+ print "/dev/fd/0 or /dev/zero doesn't exist, blank the medium completely."
+ self.blank()
+ return
cmd = self.dd + " if=/dev/zero bs=1024 count=512 | " + self.growcmd + " -Z " + self.device + "=/dev/fd/0"
print "Running " + cmd
@@ -319,17 +318,17 @@ class disk:
self.pid = proc.pid
status = proc.poll()
while status == -1:
- line = proc.fromchild.readline()
- while len(line) > 0:
- print line,
- line = proc.fromchild.readline()
- time.sleep(1)
- status = proc.poll()
+ line = proc.fromchild.readline()
+ while len(line) > 0:
+ print line,
+ line = proc.fromchild.readline()
+ time.sleep(1)
+ status = proc.poll()
self.pid = 0
print
signal.signal(signal.SIGTERM, oldsig)
if os.WEXITSTATUS(status) != 0:
- raise DVDError(os.WEXITSTATUS(status), cmd + " exited with status " + str(os.WEXITSTATUS(status)) + ", signal/status " + str(status))
+ raise DVDError(os.WEXITSTATUS(status), cmd + " exited with status " + str(os.WEXITSTATUS(status)) + ", signal/status " + str(status))
def blank(self):
cmd = self.growcmd + " -Z " + self.device + "=/dev/zero"
@@ -339,17 +338,17 @@ class disk:
self.pid = proc.pid
status = proc.poll()
while status == -1:
- line = proc.fromchild.readline()
- while len(line) > 0:
- print line,
- line = proc.fromchild.readline()
- time.sleep(1)
- status = proc.poll()
+ line = proc.fromchild.readline()
+ while len(line) > 0:
+ print line,
+ line = proc.fromchild.readline()
+ time.sleep(1)
+ status = proc.poll()
self.pid = 0
print
signal.signal(signal.SIGTERM, oldsig)
if os.WEXITSTATUS(status) != 0:
- raise DVDError(os.WEXITSTATUS(status), cmd + " exited with status " + str(os.WEXITSTATUS(status)) + ", signal/status " + str(status))
+ raise DVDError(os.WEXITSTATUS(status), cmd + " exited with status " + str(os.WEXITSTATUS(status)) + ", signal/status " + str(status))
def reformat_minus_RW(self):
cmd = self.dvdrwformat + " -force " + self.device
@@ -359,17 +358,17 @@ class disk:
self.pid = proc.pid
status = proc.poll()
while status == -1:
- line = proc.fromchild.readline()
- while len(line) > 0:
- print line,
- line = proc.fromchild.readline()
- time.sleep(1)
- status = proc.poll()
+ line = proc.fromchild.readline()
+ while len(line) > 0:
+ print line,
+ line = proc.fromchild.readline()
+ time.sleep(1)
+ status = proc.poll()
self.pid = 0
print
signal.signal(signal.SIGTERM, oldsig)
if os.WEXITSTATUS(status) != 0:
- raise DVDError(os.WEXITSTATUS(status), cmd + " exited with status " + str(os.WEXITSTATUS(status)) + ", signal/status " + str(status))
+ raise DVDError(os.WEXITSTATUS(status), cmd + " exited with status " + str(os.WEXITSTATUS(status)) + ", signal/status " + str(status))
# class disk ends here.
@@ -378,7 +377,7 @@ class DVDError(Exception):
self.errno = errno
self.value = value
if self.value[-1] == '\n':
- self.value = self.value[0:-1]
+ self.value = self.value[0:-1]
def __str__(self):
return str(self.value) + " || errno = " + str(self.errno) + " (" + os.strerror(self.errno & 0x7F) + ")"
@@ -395,19 +394,19 @@ dvd-handler DEVICE blank
where DEVICE is a device name like /dev/sr0 or /dev/dvd.
Operations:
-test Scan the device and report the information found.
- This operation needs no further arguments.
-free Scan the device and report the available space.
-write Write a part file to disk.
- This operation needs two additional arguments.
- The first indicates to append (0), restart the
- disk (1) or restart existing disk (2). The second
- is the file to write.
+test Scan the device and report the information found.
+ This operation needs no further arguments.
+free Scan the device and report the available space.
+write Write a part file to disk.
+ This operation needs two additional arguments.
+ The first indicates to append (0), restart the
+ disk (1) or restart existing disk (2). The second
+ is the file to write.
prepare Prepare a DVD+/-RW for being used by Bacula.
- Note: This is only useful if you already have some
- non-Bacula data on a medium, and you want to use
- it with Bacula. Don't run this on blank media, it
- is useless.
+ Note: This is only useful if you already have some
+ non-Bacula data on a medium, and you want to use
+ it with Bacula. Don't run this on blank media, it
+ is useless.
"""
sys.exit(1)
@@ -419,16 +418,16 @@ dvd = disk(sys.argv[1])
if "free" == sys.argv[2]:
if len(sys.argv) == 3:
try:
- free = dvd.free()
+ free = dvd.free()
except DVDError, e:
- if e.errno != 0:
- print -e.errno
- else:
- print errno.EPIPE
- print str(e)
+ if e.errno != 0:
+ print -e.errno
+ else:
+ print errno.EPIPE
+ print str(e)
else:
- print free
- print "No Error reported."
+ print free
+ print "No Error reported."
else:
print "Wrong number of arguments for free operation. Wanted 3 got", len(sys.argv)
print sys.argv[1], sys.argv[2], sys.argv[3]
@@ -436,15 +435,15 @@ if "free" == sys.argv[2]:
elif "prepare" == sys.argv[2]:
if len(sys.argv) == 3:
try:
- dvd.prepare()
+ dvd.prepare()
except DVDError, e:
- print "Error while preparing medium: ", str(e)
- if e.errno != 0:
- sys.exit(e.errno & 0x7F)
- else:
- sys.exit(errno.EPIPE)
+ print "Error while preparing medium: ", str(e)
+ if e.errno != 0:
+ sys.exit(e.errno & 0x7F)
+ else:
+ sys.exit(errno.EPIPE)
else:
- print "Medium prepared successfully."
+ print "Medium prepared successfully."
else:
print "Wrong number of arguments for prepare operation."
usage()
@@ -458,15 +457,15 @@ elif "test" == sys.argv[2]:
elif "write" == sys.argv[2]:
if len(sys.argv) == 5:
try:
- dvd.write(long(sys.argv[3]), sys.argv[4])
+ dvd.write(long(sys.argv[3]), sys.argv[4])
except DVDError, e:
- print "Error while writing part file: ", str(e)
- if e.errno != 0:
- sys.exit(e.errno & 0x7F)
- else:
- sys.exit(errno.EPIPE)
+ print "Error while writing part file: ", str(e)
+ if e.errno != 0:
+ sys.exit(e.errno & 0x7F)
+ else:
+ sys.exit(errno.EPIPE)
else:
- print "Part file " + sys.argv[4] + " successfully written to disk."
+ print "Part file " + sys.argv[4] + " successfully written to disk."
else:
print "Wrong number of arguments for write operation."
usage()
diff --git a/scripts/logrotate.in b/scripts/logrotate.in
index a06db84..825666f 100644
--- a/scripts/logrotate.in
+++ b/scripts/logrotate.in
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
# License: BSD 2-Clause; see file LICENSE-FOSS
#
#
diff --git a/scripts/manual_prune.pl b/scripts/manual_prune.pl
index 69d7f1d..d01dbbf 100755
--- a/scripts/manual_prune.pl
+++ b/scripts/manual_prune.pl
@@ -216,13 +216,13 @@ quit
while (my $l = <FP>)
{
# | 1 | TestVolume001 | Used
- if ($l =~ /^\s*\|\s*\d+\s*\|\s*([\w\d-]+)\s*\|\s*Used/) {
+ if ($l =~ /^\s*\|\s*[\d,]+\s*\|\s*([\w\d-]+)\s*\|\s*Used/) {
push @vol, $1;
}
- if ($l =~ /^\s*\|\s*\d+\s*\|\s*([\w\d-]+)\s*\|\s*Full/) {
+ if ($l =~ /^\s*\|\s*[\d,]+\s*\|\s*([\w\d-]+)\s*\|\s*Full/) {
push @vol, $1;
}
- if ($l =~ /^\s*\|\s*\d+\s*\|\s*([\w\d-]+)\s*\|\s*Purged/) {
+ if ($l =~ /^\s*\|\s*[\d,]+\s*\|\s*([\w\d-]+)\s*\|\s*Purged/) {
push @vol_purged, $1;
}
}
diff --git a/scripts/mtx-changer.in b/scripts/mtx-changer.in
index 9c7111d..f1dc2d3 100644
--- a/scripts/mtx-changer.in
+++ b/scripts/mtx-changer.in
@@ -2,8 +2,7 @@
#
# Bacula(R) - The Network Backup Solution
#
-# Copyright (C) 2000-2015 Kern Sibbald
-# Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+# Copyright (C) 2000-2016 Kern Sibbald
#
# The original author of Bacula is Kern Sibbald, with contributions
# from many others, a complete list can be found in the file AUTHORS.
@@ -27,7 +26,7 @@
# in come cases, not all are used.
#
# mtx-changer "changer-device" "command" "slot" "archive-device" "drive-index"
-# $1 $2 $3 $4 $5
+# $1 $2 $3 $4 $5
#
# for example:
#
@@ -38,13 +37,13 @@
# is /dev/nst0.
#
# The commands are:
-# Command Function
-# unload unload a given slot
-# load load a given slot
-# loaded which slot is loaded?
-# list list Volume names (requires barcode reader)
-# slots how many slots total?
-# listall list all info
+# Command Function
+# unload unload a given slot
+# load load a given slot
+# loaded which slot is loaded?
+# list list Volume names (requires barcode reader)
+# slots how many slots total?
+# listall list all info
# transfer
#
# Slots are numbered from 1 ...
@@ -89,7 +88,7 @@ fi
dbgfile="@working_dir@/mtx.log"
debug() {
if test -f $dbgfile -a ${debug_level} -ge $1; then
- echo "`date +%m%d-%H:%M:%S.%N|cut -c1-16` ${chgr_id} $2" >> $dbgfile
+ echo "`date +%m%d-%H:%M:%S.%N|cut -c1-16` ${chgr_id} $2" >> $dbgfile
fi
}
@@ -102,8 +101,8 @@ make_temp_file() {
if test x${TMPFILE} = x; then
TMPFILE="@working_dir@/mtx.$$"
if test -f ${TMPFILE}; then
- echo "ERROR: Temp file security problem on: ${TMPFILE}"
- exit 1
+ echo "ERROR: Temp file security problem on: ${TMPFILE}"
+ exit 1
fi
fi
}
@@ -124,8 +123,8 @@ make_err_file() {
if test x${ERRFILE} = x; then
ERRFILE="@working_dir@/mtx.err.$$"
if test -f ${ERRFILE}; then
- echo "ERROR: Temp file security problem on: ${ERRFILE}"
- exit 1
+ echo "ERROR: Temp file security problem on: ${ERRFILE}"
+ exit 1
fi
fi
}
@@ -160,14 +159,14 @@ check_parm_count() {
pCount=$1
pCountNeed=$2
if test $pCount -lt $pCountNeed; then
- echo "ERROR: usage: mtx-changer ctl-device command [slot archive-device drive-index]"
- echo " Insufficient number of arguments given."
- if test $pCount -lt 2; then
- echo " Mimimum usage is first two arguments ..."
- else
- echo " Command expected $pCountNeed arguments"
- fi
- exit 1
+ echo "ERROR: usage: mtx-changer ctl-device command [slot archive-device drive-index]"
+ echo " Insufficient number of arguments given."
+ if test $pCount -lt 2; then
+ echo " Mimimum usage is first two arguments ..."
+ else
+ echo " Command expected $pCountNeed arguments"
+ fi
+ exit 1
fi
}
@@ -176,17 +175,17 @@ check_parm_count() {
#
case $2 in
list|listall)
- check_parm_count $# 2
- ;;
+ check_parm_count $# 2
+ ;;
slots)
- check_parm_count $# 2
- ;;
+ check_parm_count $# 2
+ ;;
transfer)
- check_parm_count $# 4
- ;;
+ check_parm_count $# 4
+ ;;
*)
- check_parm_count $# 5
- ;;
+ check_parm_count $# 5
+ ;;
esac
@@ -203,29 +202,29 @@ case $cmd in
unload)
if test ${offline} -eq 1 ; then
- mt -f $device offline
+ mt -f $device offline
fi
if test ${offline_sleep} -ne 0 ; then
- sleep ${offline_sleep}
+ sleep ${offline_sleep}
fi
make_err_file
for i in 1 2 3 4 5 ; do
- debug $idbglvl "Doing mtx -f $ctl unload slot=$slot drv=$drive"
- ${MTX} -f $ctl unload $slot $drive 2>${ERRFILE}
- rtn=$?
- if test $rtn -eq 0 ; then
- break
- fi
- grep "Error Code=" ${ERRFILE} 2>/dev/null 1>/dev/null
- if test $? -ne 0 ; then
- break
- fi
- sleep $i
+ debug $idbglvl "Doing mtx -f $ctl unload slot=$slot drv=$drive"
+ ${MTX} -f $ctl unload $slot $drive 2>${ERRFILE}
+ rtn=$?
+ if test $rtn -eq 0 ; then
+ break
+ fi
+ grep "Error Code=" ${ERRFILE} 2>/dev/null 1>/dev/null
+ if test $? -ne 0 ; then
+ break
+ fi
+ sleep $i
done
cat ${ERRFILE}
rm -f ${ERRFILE} >/dev/null 2>&1
if test $rtn -ne 0 ; then
- debug $idbglvl "FAIL: mtx -f $ctl unload slot=$slot drv=$drive"
+ debug $idbglvl "FAIL: mtx -f $ctl unload slot=$slot drv=$drive"
fi
exit $rtn
;;
@@ -233,26 +232,26 @@ case $cmd in
load)
make_err_file
for i in 1 2 3 4 5 ; do
- debug $idbglvl "Doing mtx -f $ctl load slot=$slot drv=$drive"
- ${MTX} -f $ctl load $slot $drive 2>${ERRFILE}
- rtn=$?
- if test $rtn -eq 0 ; then
- break
- fi
- grep "Error Code=" ${ERRFILE} 2>/dev/null 1>/dev/null
- if test $? -ne 0 ; then
- break
- fi
- sleep $i
+ debug $idbglvl "Doing mtx -f $ctl load slot=$slot drv=$drive"
+ ${MTX} -f $ctl load $slot $drive 2>${ERRFILE}
+ rtn=$?
+ if test $rtn -eq 0 ; then
+ break
+ fi
+ grep "Error Code=" ${ERRFILE} 2>/dev/null 1>/dev/null
+ if test $? -ne 0 ; then
+ break
+ fi
+ sleep $i
done
if test ${load_sleep} -ne 0 ; then
- sleep ${load_sleep}
+ sleep ${load_sleep}
fi
wait_for_drive $device
cat ${ERRFILE}
rm -f ${ERRFILE} >/dev/null 2>&1
if test $rtn -ne 0 ; then
- debug $idbglvl "FAIL: mtx -f $ctl load slot=$slot drv=$drive"
+ debug $idbglvl "FAIL: mtx -f $ctl load slot=$slot drv=$drive"
fi
exit $rtn
;;
@@ -260,43 +259,43 @@ case $cmd in
list)
make_temp_file
if test ${inventory} -ne 0 ; then
- ${MTX} -f $ctl inventory
+ ${MTX} -f $ctl inventory
fi
debug $dbglvl "Doing mtx -f $ctl list"
${MTX} -f $ctl status >${TMPFILE}
rtn=$?
if test ${vxa_packetloader} -ne 0 ; then
- cat ${TMPFILE} | grep " *Storage Element [0-9]*:.*Full" | sed "s/ Storage Element //" | sed "s/Full :VolumeTag=//"
+ cat ${TMPFILE} | grep " *Storage Element [0-9]*:.*Full" | sed "s/ Storage Element //" | sed "s/Full :VolumeTag=//"
else
- cat ${TMPFILE} | grep " Storage Element [0-9]*:.*Full" | awk "{print \$3 \$4}" | sed "s/Full *\(:VolumeTag=\)*//"
+ cat ${TMPFILE} | grep " Storage Element [0-9]*:.*Full" | awk "{print \$3 \$4}" | sed "s/Full *\(:VolumeTag=\)*//"
fi
cat ${TMPFILE} | grep "^Data Transfer Element [0-9]*:Full (Storage Element [0-9]" | awk '{printf "%s:%s\n",$7,$10}'
rm -f ${TMPFILE} >/dev/null 2>&1
if test $rtn -ne 0 ; then
- debug $idbglvl "FAIL: mtx -f $ctl list"
+ debug $idbglvl "FAIL: mtx -f $ctl list"
fi
exit $rtn
;;
listall)
-# Drive content: D:Drive num:F:Slot loaded:Volume Name
+# Drive content: D:Drive num:F:Slot loaded:Volume Name
# D:0:F:2:vol2 or D:Drive num:E
# D:1:F:42:vol42
# D:3:E
#
# Slot content:
-# S:1:F:vol1 S:Slot num:F:Volume Name
-# S:2:E or S:Slot num:E
+# S:1:F:vol1 S:Slot num:F:Volume Name
+# S:2:E or S:Slot num:E
# S:3:F:vol4
#
# Import/Export tray slots:
-# I:10:F:vol10 I:Slot num:F:Volume Name
-# I:11:E or I:Slot num:E
+# I:10:F:vol10 I:Slot num:F:Volume Name
+# I:11:E or I:Slot num:E
# I:12:F:vol40
make_temp_file
if test ${inventory} -ne 0 ; then
- ${MTX} -f $ctl inventory
+ ${MTX} -f $ctl inventory
fi
debug $dbglvl "Doing mtx -f $ctl -- to list all"
${MTX} -f $ctl status >${TMPFILE}
@@ -324,7 +323,7 @@ case $cmd in
${MTX} -f $ctl transfer $slot $slotdest
rtn=$?
if test $rtn -ne 0 ; then
- debug $idbglvl "FAIL: mtx -f $ctl transfer from=$slot to=$slotdest"
+ debug $idbglvl "FAIL: mtx -f $ctl transfer from=$slot to=$slotdest"
fi
exit $rtn
;;
@@ -338,7 +337,7 @@ case $cmd in
cat ${TMPFILE} | grep "^Data Transfer Element $drive:Empty" | awk "{print 0}"
rm -f ${TMPFILE} >/dev/null 2>&1
if test $rtn -ne 0 ; then
- debug $idbglvl "FAIL: mtx -f $ctl loaded drv=$drive"
+ debug $idbglvl "FAIL: mtx -f $ctl loaded drv=$drive"
fi
exit $rtn
;;
@@ -348,7 +347,7 @@ case $cmd in
${MTX} -f $ctl status | grep " *Storage Changer" | awk "{print \$5}"
rtn=$?
if test $rtn -ne 0 ; then
- debug $idbglvl "FAIL: mtx -f $ctl slots"
+ debug $idbglvl "FAIL: mtx -f $ctl slots"
fi
;;
esac
diff --git a/src/cats/bdb.h b/src/cats/bdb.h
index 87b260b..ae4770b 100644
--- a/src/cats/bdb.h
+++ b/src/cats/bdb.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2015 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/cats/bdb_mysql.h b/src/cats/bdb_mysql.h
index d260a76..ac0d167 100644
--- a/src/cats/bdb_mysql.h
+++ b/src/cats/bdb_mysql.h
@@ -1,71 +1,70 @@
-/*
+/*
Bacula(R) - The Network Backup Solution
-
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2009-2014 Free Software Foundation Europe e.V.
-
+
+ Copyright (C) 2000-2016 Kern Sibbald
+
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
-
+
You may use this file and others of this release according to the
license defined in the LICENSE file, which includes the Affero General
Public License, v3.0 ("AGPLv3") and some additional permissions and
terms pursuant to its AGPLv3 Section 7.
-
+
This notice must be preserved when any source code is
conveyed and/or propagated.
-
+
Bacula(R) is a registered trademark of Kern Sibbald.
-*/
-
+*/
+
/* MySQL driver specific definitions */
-
-#ifdef __BDB_MYSQL_H_
-
-/*
- * Number of insert statements to batch-up in batch insert
- * mode. We use multi-row inserts only in the batch mode
- * on the private database connection.
- */
-#define MYSQL_CHANGES_PER_BATCH_INSERT 32
-
+
+#ifdef BDB_MYSQL_H_
+
+/*
+ * Number of insert statements to batch-up in batch insert
+ * mode. We use multi-row inserts only in the batch mode
+ * on the private database connection.
+ */
+#define MYSQL_CHANGES_PER_BATCH_INSERT 32
+
class BDB_MYSQL: public BDB {
-private:
- MYSQL *m_db_handle;
- MYSQL m_instance;
- MYSQL_RES *m_result;
-
-public:
- BDB_MYSQL();
- ~BDB_MYSQL();
-
- /* Functions that we override */
- bool bdb_open_database(JCR *jcr);
- void bdb_close_database(JCR *jcr);
- void bdb_thread_cleanup(void);
- void bdb_escape_string(JCR *jcr, char *snew, char *old, int len);
- char *bdb_escape_object(JCR *jcr, char *old, int len);
- void bdb_unescape_object(JCR *jcr, char *from, int32_t expected_len,
- POOLMEM **dest, int32_t *len);
- void bdb_start_transaction(JCR *jcr);
- void bdb_end_transaction(JCR *jcr);
- bool bdb_sql_query(const char *query, DB_RESULT_HANDLER *result_handler, void *ctx);
- void sql_free_result(void);
- SQL_ROW sql_fetch_row(void);
- bool sql_query(const char *query, int flags=0);
- const char *sql_strerror(void);
- int sql_num_rows(void);
- void sql_data_seek(int row);
- int sql_affected_rows(void);
- uint64_t sql_insert_autokey_record(const char *query, const char *table_name);
- void sql_field_seek(int field);
- SQL_FIELD *sql_fetch_field(void);
- int sql_num_fields(void);
- bool sql_field_is_not_null(int field_type);
- bool sql_field_is_numeric(int field_type);
- bool sql_batch_start(JCR *jcr);
- bool sql_batch_end(JCR *jcr, const char *error);
- bool sql_batch_insert(JCR *jcr, ATTR_DBR *ar);
-};
-
-#endif /* __BDB_MYSQL_H_ */
+private:
+ MYSQL *m_db_handle;
+ MYSQL m_instance;
+ MYSQL_RES *m_result;
+
+public:
+ BDB_MYSQL();
+ ~BDB_MYSQL();
+
+ /* Functions that we override */
+ bool bdb_open_database(JCR *jcr);
+ void bdb_close_database(JCR *jcr);
+ void bdb_thread_cleanup(void);
+ void bdb_escape_string(JCR *jcr, char *snew, char *old, int len);
+ char *bdb_escape_object(JCR *jcr, char *old, int len);
+ void bdb_unescape_object(JCR *jcr, char *from, int32_t expected_len,
+ POOLMEM **dest, int32_t *len);
+ void bdb_start_transaction(JCR *jcr);
+ void bdb_end_transaction(JCR *jcr);
+ bool bdb_sql_query(const char *query, DB_RESULT_HANDLER *result_handler, void *ctx);
+ void sql_free_result(void);
+ SQL_ROW sql_fetch_row(void);
+ bool sql_query(const char *query, int flags=0);
+ const char *sql_strerror(void);
+ int sql_num_rows(void);
+ void sql_data_seek(int row);
+ int sql_affected_rows(void);
+ uint64_t sql_insert_autokey_record(const char *query, const char *table_name);
+ void sql_field_seek(int field);
+ SQL_FIELD *sql_fetch_field(void);
+ int sql_num_fields(void);
+ bool sql_field_is_not_null(int field_type);
+ bool sql_field_is_numeric(int field_type);
+ bool sql_batch_start(JCR *jcr);
+ bool sql_batch_end(JCR *jcr, const char *error);
+ bool sql_batch_insert(JCR *jcr, ATTR_DBR *ar);
+};
+
+#endif /* BDB_MYSQL_H_ */
diff --git a/src/cats/bvfs.c b/src/cats/bvfs.c
index ff236cb..372149e 100644
--- a/src/cats/bvfs.c
+++ b/src/cats/bvfs.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/cats/bvfs.h b/src/cats/bvfs.h
index 7f792ac..5eb8f0a 100644
--- a/src/cats/bvfs.h
+++ b/src/cats/bvfs.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/cats/cats.c b/src/cats/cats.c
index 5e19cd5..3cfbaed 100644
--- a/src/cats/cats.c
+++ b/src/cats/cats.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/cats/cats.h b/src/cats/cats.h
index 2908f15..e2d48f6 100644
--- a/src/cats/cats.h
+++ b/src/cats/cats.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/cats/cats_null.c b/src/cats/cats_null.c
index f3da1c2..f5c360a 100644
--- a/src/cats/cats_null.c
+++ b/src/cats/cats_null.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/cats/mysql.c b/src/cats/mysql.c
index 3ac8af7..d722bf4 100644
--- a/src/cats/mysql.c
+++ b/src/cats/mysql.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/cats/postgresql.c b/src/cats/postgresql.c
index f8fa4a9..51d1a13 100644
--- a/src/cats/postgresql.c
+++ b/src/cats/postgresql.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/cats/protos.h b/src/cats/protos.h
index 61c9119..e6a9c22 100644
--- a/src/cats/protos.h
+++ b/src/cats/protos.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/cats/sql.c b/src/cats/sql.c
index 4b1278d..e241d09 100644
--- a/src/cats/sql.c
+++ b/src/cats/sql.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/cats/sql_cmds.c b/src/cats/sql_cmds.c
index d80003b..ebd439c 100644
--- a/src/cats/sql_cmds.c
+++ b/src/cats/sql_cmds.c
@@ -1013,3 +1013,12 @@ const char *expired_volumes[] = {
/* SQLite */
expired_volumes_defaults
};
+
+const char *expires_in[] = {
+ /* MySQL */
+ "(GREATEST(0, CAST(UNIX_TIMESTAMP(LastWritten) + VolRetention AS SIGNED) - UNIX_TIMESTAMP(NOW())))",
+ /* PostgreSQL */
+ "GREATEST(0, (extract('epoch' from LastWritten + VolRetention * interval '1second' - NOW())::bigint))",
+ /* SQLite */
+ "MAX(0, (strftime('%s', LastWritten) + VolRetention - strftime('%s', datetime('now', 'localtime'))))"
+};
diff --git a/src/cats/sql_cmds.h b/src/cats/sql_cmds.h
index 2c91f6f..43ded93 100644
--- a/src/cats/sql_cmds.h
+++ b/src/cats/sql_cmds.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -87,3 +86,4 @@ extern const char CATS_IMP_EXP *uar_sel_fileset;
extern const char CATS_IMP_EXP *uar_sel_filesetid;
extern const char CATS_IMP_EXP *uar_sel_jobid_temp;
extern const char CATS_IMP_EXP *update_counter_values[];
+extern const char CATS_IMP_EXP *expires_in[];
diff --git a/src/cats/sql_create.c b/src/cats/sql_create.c
index 9a84a49..047c650 100644
--- a/src/cats/sql_create.c
+++ b/src/cats/sql_create.c
@@ -971,7 +971,6 @@ int BDB::bdb_create_file_record(JCR *jcr, ATTR_DBR *ar)
int BDB::bdb_create_filename_record(JCR *jcr, ATTR_DBR *ar)
{
SQL_ROW row;
- int num_rows;
errmsg[0] = 0;
esc_name = check_pool_memory_size(esc_name, 2*fnl+2);
@@ -980,14 +979,13 @@ int BDB::bdb_create_filename_record(JCR *jcr, ATTR_DBR *ar)
Mmsg(cmd, "SELECT FilenameId FROM Filename WHERE Name='%s'", esc_name);
if (QueryDB(jcr, cmd)) {
- num_rows = sql_num_rows();
- if (num_rows > 1) {
+ if (sql_num_rows() > 1) {
char ed1[30];
Mmsg2(&errmsg, _("More than one Filename! %s for file: %s\n"),
- edit_uint64(num_rows, ed1), fname);
+ edit_uint64(sql_num_rows(), ed1), fname);
Jmsg(jcr, M_WARNING, 0, "%s", errmsg);
}
- if (num_rows >= 1) {
+ if (sql_num_rows() >= 1) {
if ((row = sql_fetch_row()) == NULL) {
Mmsg2(&errmsg, _("Error fetching row for file=%s: ERR=%s\n"),
fname, sql_strerror());
diff --git a/src/cats/sql_delete.c b/src/cats/sql_delete.c
index 97bff2b..b52c379 100644
--- a/src/cats/sql_delete.c
+++ b/src/cats/sql_delete.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/cats/sql_find.c b/src/cats/sql_find.c
index c9b2d5b..8adba6c 100644
--- a/src/cats/sql_find.c
+++ b/src/cats/sql_find.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/cats/sql_get.c b/src/cats/sql_get.c
index 4f60b7f..d6ae982 100644
--- a/src/cats/sql_get.c
+++ b/src/cats/sql_get.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -68,7 +68,7 @@ bool BDB::bdb_get_file_attributes_record(JCR *jcr, char *afname, JOB_DBR *jr, FI
}
-/**
+/*
* Get a File record
*
* DO NOT use Jmsg in this routine.
@@ -162,10 +162,9 @@ bool BDB::bdb_get_file_record(JCR *jcr, JOB_DBR *jr, FILE_DBR *fdbr)
Mmsg(errmsg, _("File record not found in Catalog.\n"));
}
return ok;
-
}
-/**
+/*
* Get Filename record
* Returns: 0 on failure
* FilenameId on success
diff --git a/src/cats/sql_list.c b/src/cats/sql_list.c
index 0171eb8..309e0db 100644
--- a/src/cats/sql_list.c
+++ b/src/cats/sql_list.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -195,6 +195,7 @@ void BDB::bdb_list_media_records(JCR *jcr, MEDIA_DBR *mdbr,
{
char ed1[50];
char esc[MAX_ESCAPE_NAME_LENGTH];
+ const char *expiresin = expires_in[bdb_get_type_index()];
bdb_lock();
bdb_escape_string(jcr, esc, mdbr->VolumeName, strlen(mdbr->VolumeName));
@@ -210,8 +211,8 @@ void BDB::bdb_list_media_records(JCR *jcr, MEDIA_DBR *mdbr,
"EndFile,EndBlock,VolParts,LabelType,StorageId,DeviceId,"
"MediaAddressing,VolReadTime,VolWriteTime,"
"LocationId,RecycleCount,InitialWrite,ScratchPoolId,RecyclePoolId, "
- "ActionOnPurge,Comment"
- " FROM Media WHERE Media.VolumeName='%s'", esc);
+ "ActionOnPurge,%s AS ExpiresIn, Comment"
+ " FROM Media WHERE Media.VolumeName='%s'", expiresin, esc);
} else {
Mmsg(cmd, "SELECT MediaId,VolumeName,Slot,PoolId,"
"MediaType,MediaTypeId,FirstWritten,LastWritten,LabelDate,VolJobs,"
@@ -222,20 +223,20 @@ void BDB::bdb_list_media_records(JCR *jcr, MEDIA_DBR *mdbr,
"EndFile,EndBlock,VolParts,LabelType,StorageId,DeviceId,"
"MediaAddressing,VolReadTime,VolWriteTime,"
"LocationId,RecycleCount,InitialWrite,ScratchPoolId,RecyclePoolId, "
- "ActionOnPurge,Comment"
+ "ActionOnPurge,%s AS ExpiresIn, Comment"
" FROM Media WHERE Media.PoolId=%s ORDER BY MediaId",
- edit_int64(mdbr->PoolId, ed1));
+ expiresin, edit_int64(mdbr->PoolId, ed1));
}
} else {
if (mdbr->VolumeName[0] != 0) {
Mmsg(cmd, "SELECT MediaId,VolumeName,VolStatus,Enabled,"
- "VolBytes,VolFiles,VolRetention,Recycle,Slot,InChanger,MediaType,VolParts,LastWritten "
- "FROM Media WHERE Media.VolumeName='%s'", esc);
+ "VolBytes,VolFiles,VolRetention,Recycle,Slot,InChanger,MediaType,LastWritten,%s AS ExpiresIn "
+ "FROM Media WHERE Media.VolumeName='%s'", expiresin, esc);
} else {
Mmsg(cmd, "SELECT MediaId,VolumeName,VolStatus,Enabled,"
- "VolBytes,VolFiles,VolRetention,Recycle,Slot,InChanger,MediaType,VolParts,LastWritten "
+ "VolBytes,VolFiles,VolRetention,Recycle,Slot,InChanger,MediaType,LastWritten,%s AS ExpiresIn "
"FROM Media WHERE Media.PoolId=%s ORDER BY MediaId",
- edit_int64(mdbr->PoolId, ed1));
+ expiresin, edit_int64(mdbr->PoolId, ed1));
}
}
diff --git a/src/cats/sql_update.c b/src/cats/sql_update.c
index f4da1e3..205a6d3 100644
--- a/src/cats/sql_update.c
+++ b/src/cats/sql_update.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/cats/sqlite.c b/src/cats/sqlite.c
index bed7e62..7dcbafe 100644
--- a/src/cats/sqlite.c
+++ b/src/cats/sqlite.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/console/authenticate.c b/src/console/authenticate.c
index cd50f28..17296cc 100644
--- a/src/console/authenticate.c
+++ b/src/console/authenticate.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/console/conio.c b/src/console/conio.c
index 03860af..04edb82 100755
--- a/src/console/conio.c
+++ b/src/console/conio.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/console/conio.h b/src/console/conio.h
index d44ceaf..afec016 100644
--- a/src/console/conio.h
+++ b/src/console/conio.h
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/console/console.c b/src/console/console.c
index 1ca30ae..e1862b8 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/console/console_conf.c b/src/console/console_conf.c
index 012fb01..202c21e 100644
--- a/src/console/console_conf.c
+++ b/src/console/console_conf.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/console/console_conf.h b/src/console/console_conf.h
index 5d0dea2..4d5eee7 100644
--- a/src/console/console_conf.h
+++ b/src/console/console_conf.h
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/console/func.h b/src/console/func.h
index a527d7a..e37a55a 100755
--- a/src/console/func.h
+++ b/src/console/func.h
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/dird/vbackup.c b/src/dird/vbackup.c
index 2152330..07ec06c 100644
--- a/src/dird/vbackup.c
+++ b/src/dird/vbackup.c
@@ -1,7 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/filed/filed.c b/src/filed/filed.c
index 85ab023..677d172 100644
--- a/src/filed/filed.c
+++ b/src/filed/filed.c
@@ -543,7 +543,7 @@ static bool check_resources()
/* Construct disabled command array */
for (i=0; cmds[i].cmd; i++) { } /* Count commands */
- if (me->disable_cmds) {
+ if (director->disable_cmds) {
director->disabled_cmds_array = (bool *)malloc(i);
memset(director->disabled_cmds_array, 0, i);
foreach_alist(cmd, director->disable_cmds) {
diff --git a/src/filed/heartbeat.c b/src/filed/heartbeat.c
index e3ffdcd..c93e407 100644
--- a/src/filed/heartbeat.c
+++ b/src/filed/heartbeat.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/filed/hello.c b/src/filed/hello.c
index 2ec9105..87a31ba 100644
--- a/src/filed/hello.c
+++ b/src/filed/hello.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/filed/xattr.h b/src/filed/xattr.h
index b2bbe23..62742a8 100644
--- a/src/filed/xattr.h
+++ b/src/filed/xattr.h
@@ -18,8 +18,8 @@
Bacula(R) is a registered trademark of Kern Sibbald.
*/
-#ifndef __BXATTR_H_
-#define __BXATTR_H_
+#ifndef BACULA_XATTR_H_
+#define BACULA_XATTR_H_
#if defined(HAVE_LINUX_OS)
#define BXATTR_ENOTSUP EOPNOTSUPP
@@ -74,4 +74,4 @@ struct xattr_ctx_t {
#define XATTR_BUFSIZ 1024
-#endif /* __BXATTR_H_ */
+#endif /* BACULA_XATTR_H_ */
diff --git a/src/findlib/fstype.c b/src/findlib/fstype.c
index dc4f65d..ab3b206 100644
--- a/src/findlib/fstype.c
+++ b/src/findlib/fstype.c
@@ -337,7 +337,41 @@ bool fstype(FF_PKT *ff_pkt, char *fs, int fslen)
/* Read mtab entries */
bool read_mtab(mtab_handler_t *mtab_handler, void *user_ctx)
{
-#ifdef HAVE_GETMNTENT
+/* Debian stretch GNU/KFreeBSD has both getmntinfo and getmntent, but
+ only the first seems to work, so ordering is important here */
+#ifdef HAVE_GETMNTINFO
+ struct stat st;
+#if defined(ST_NOWAIT)
+ int flags = ST_NOWAIT;
+#elif defined(MNT_NOWAIT)
+ int flags = MNT_NOWAIT;
+#else
+ int flags = 0;
+#endif
+#if defined(HAVE_NETBSD_OS)
+ struct statvfs *mntinfo;
+#else
+ struct statfs *mntinfo;
+#endif
+ int nument;
+
+ P(mutex);
+ if ((nument = getmntinfo(&mntinfo, flags)) > 0) {
+ while (nument-- > 0) {
+ if (is_rootfs(mntinfo->f_fstypename)) {
+ continue;
+ }
+ if (stat(mntinfo->f_mntonname, &st) < 0) {
+ continue;
+ }
+ mtab_handler(user_ctx, &st, mntinfo->f_mntfromname,
+ mntinfo->f_mntonname, mntinfo->f_fstypename, NULL);
+ mntinfo++;
+ }
+ }
+ V(mutex);
+/* HAVE_GETMNTINFO */
+#elif defined(HAVE_GETMNTENT)
FILE *mntfp;
struct stat st;
@@ -389,39 +423,6 @@ bool read_mtab(mtab_handler_t *mtab_handler, void *user_ctx)
#endif
#endif /* HAVE_GETMNTENT */
-
-#ifdef HAVE_GETMNTINFO
- struct stat st;
-#if defined(ST_NOWAIT)
- int flags = ST_NOWAIT;
-#elif defined(MNT_NOWAIT)
- int flags = MNT_NOWAIT;
-#else
- int flags = 0;
-#endif
-#if defined(HAVE_NETBSD_OS)
- struct statvfs *mntinfo;
-#else
- struct statfs *mntinfo;
-#endif
- int nument;
-
- P(mutex);
- if ((nument = getmntinfo(&mntinfo, flags)) > 0) {
- while (nument-- > 0) {
- if (is_rootfs(mntinfo->f_fstypename)) {
- continue;
- }
- if (stat(mntinfo->f_mntonname, &st) < 0) {
- continue;
- }
- mtab_handler(user_ctx, &st, mntinfo->f_mntfromname,
- mntinfo->f_mntonname, mntinfo->f_fstypename, NULL);
- mntinfo++;
- }
- }
- V(mutex);
-#endif /* HAVE_GETMNTINFO */
return true;
}
diff --git a/src/lib/address_conf.c b/src/lib/address_conf.c
index 66a49d2..669f5ef 100644
--- a/src/lib/address_conf.c
+++ b/src/lib/address_conf.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/address_conf.h b/src/lib/address_conf.h
index e745b36..4c60346 100644
--- a/src/lib/address_conf.h
+++ b/src/lib/address_conf.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/alist.c b/src/lib/alist.c
index 38a197f..132d1a0 100644
--- a/src/lib/alist.c
+++ b/src/lib/alist.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/alist.h b/src/lib/alist.h
index 0964149..c9b041a 100644
--- a/src/lib/alist.h
+++ b/src/lib/alist.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/attr.c b/src/lib/attr.c
index 595cebd..24dc05f 100644
--- a/src/lib/attr.c
+++ b/src/lib/attr.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/attr.h b/src/lib/attr.h
index d8d7a31..6c76554 100644
--- a/src/lib/attr.h
+++ b/src/lib/attr.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/base64.c b/src/lib/base64.c
index deb2cae..f2c58b1 100644
--- a/src/lib/base64.c
+++ b/src/lib/base64.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/base64.h b/src/lib/base64.h
index 6313482..ff48a71 100644
--- a/src/lib/base64.h
+++ b/src/lib/base64.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/berrno.c b/src/lib/berrno.c
index 382683c..747337d 100644
--- a/src/lib/berrno.c
+++ b/src/lib/berrno.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/berrno.h b/src/lib/berrno.h
index e6b099b..e5c4b70 100644
--- a/src/lib/berrno.h
+++ b/src/lib/berrno.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/bget_msg.c b/src/lib/bget_msg.c
index ff9b0e4..fc20f94 100644
--- a/src/lib/bget_msg.c
+++ b/src/lib/bget_msg.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/bget_msg.h b/src/lib/bget_msg.h
index fa8f011..388b0e0 100644
--- a/src/lib/bget_msg.h
+++ b/src/lib/bget_msg.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2013-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/binflate.c b/src/lib/binflate.c
index 9cd73f2..dcaa844 100644
--- a/src/lib/binflate.c
+++ b/src/lib/binflate.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2010-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/bits.h b/src/lib/bits.h
index 4974700..43a132b 100644
--- a/src/lib/bits.h
+++ b/src/lib/bits.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/bnet.c b/src/lib/bnet.c
index 52c8e05..4eddee2 100644
--- a/src/lib/bnet.c
+++ b/src/lib/bnet.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -48,9 +47,9 @@
#define socketClose(fd) close(fd)
#endif
-#ifndef HAVE_GETADDRINFO
+#ifndef HAVE_GETADDRINFO
static pthread_mutex_t ip_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
+#endif
/*
* Read a nbytes from the network.
@@ -328,6 +327,14 @@ bool bnet_tls_client(TLS_CONTEXT *ctx, BSOCK * bsock, alist *verify_list)
#define NO_DATA 4 /* Valid name, no data record of requested type. */
#endif
+static IPADDR *add_any(int family)
+{
+ IPADDR *addr = New(IPADDR(family));
+ addr->set_type(IPADDR::R_MULTIPLE);
+ addr->set_addr_any();
+ return addr;
+}
+
#if defined(HAVE_GETADDRINFO)
/*
* getaddrinfo.c - Simple example of using getaddrinfo(3) function.
@@ -446,7 +453,7 @@ static const char *resolv_host(int family, const char *host, dlist * addr_list)
#ifdef HAVE_IPV6
else {
addr->set_addr6((struct in6_addr*)*p);
- }
+ }
#endif
addr_list->append(addr);
}
@@ -454,16 +461,8 @@ static const char *resolv_host(int family, const char *host, dlist * addr_list)
}
return NULL;
}
-#endif
-
-static IPADDR *add_any(int family)
-{
- IPADDR *addr = New(IPADDR(family));
- addr->set_type(IPADDR::R_MULTIPLE);
- addr->set_addr_any();
- return addr;
-}
-
+#endif
+
/*
* i host = 0 means INADDR_ANY only for IPv4
*/
diff --git a/src/lib/bnet_server.c b/src/lib/bnet_server.c
index 354320d..1699340 100644
--- a/src/lib/bnet_server.c
+++ b/src/lib/bnet_server.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/bpipe.c b/src/lib/bpipe.c
index c0ef83a..92b5b85 100644
--- a/src/lib/bpipe.c
+++ b/src/lib/bpipe.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/bpipe.h b/src/lib/bpipe.h
index 038be35..9da6745 100644
--- a/src/lib/bpipe.h
+++ b/src/lib/bpipe.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/breg.c b/src/lib/breg.c
index 6358796..8034c2c 100644
--- a/src/lib/breg.c
+++ b/src/lib/breg.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/breg.h b/src/lib/breg.h
index e364860..e21ffef 100644
--- a/src/lib/breg.h
+++ b/src/lib/breg.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/bregex.c b/src/lib/bregex.c
index 5ac6e6d..994b015 100644
--- a/src/lib/bregex.c
+++ b/src/lib/bregex.c
@@ -16,7 +16,6 @@
*
* This code draws many ideas from the regular expression packages by
* Henry Spencer of the University of Toronto and Richard Stallman of
- * the Free Software Foundation.
*
* Emacs-specific code and syntax table code is almost directly borrowed
* from GNU regexp.
@@ -35,8 +34,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/bregex.h b/src/lib/bregex.h
index 1a40e19..654e569 100644
--- a/src/lib/bregex.h
+++ b/src/lib/bregex.h
@@ -27,8 +27,7 @@ extern "C" {
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/bsnprintf.c b/src/lib/bsnprintf.c
index f669f52..6ca1480 100644
--- a/src/lib/bsnprintf.c
+++ b/src/lib/bsnprintf.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/bsock.c b/src/lib/bsock.c
index 6daef47..ced1112 100644
--- a/src/lib/bsock.c
+++ b/src/lib/bsock.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/bsock.h b/src/lib/bsock.h
index 2248212..97f84bc 100644
--- a/src/lib/bsock.h
+++ b/src/lib/bsock.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/bsys.c b/src/lib/bsys.c
index 4226e01..9235ab2 100644
--- a/src/lib/bsys.c
+++ b/src/lib/bsys.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/btime.c b/src/lib/btime.c
index 0748a10..3f0f548 100644
--- a/src/lib/btime.c
+++ b/src/lib/btime.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/btime.h b/src/lib/btime.h
index c4632e8..6d339b2 100644
--- a/src/lib/btime.h
+++ b/src/lib/btime.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/btimers.c b/src/lib/btimers.c
index 543c0f0..131501f 100644
--- a/src/lib/btimers.c
+++ b/src/lib/btimers.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/btimers.h b/src/lib/btimers.h
index c43690d..0b14bb4 100644
--- a/src/lib/btimers.h
+++ b/src/lib/btimers.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/cram-md5.c b/src/lib/cram-md5.c
index 5583be4..035983a 100644
--- a/src/lib/cram-md5.c
+++ b/src/lib/cram-md5.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/crypto.c b/src/lib/crypto.c
index bf4a182..9f309d5 100644
--- a/src/lib/crypto.c
+++ b/src/lib/crypto.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/crypto.h b/src/lib/crypto.h
index 9b4728f..f036671 100644
--- a/src/lib/crypto.h
+++ b/src/lib/crypto.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/daemon.c b/src/lib/daemon.c
index 31e4a25..1f74f30 100644
--- a/src/lib/daemon.c
+++ b/src/lib/daemon.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -65,16 +64,16 @@ daemon_start()
if (debug_level > 0) {
next_fd = 3; /* don't close debug output */
}
-
-#if defined(HAVE_FCNTL_F_CLOSEM)
+
+#if HAVE_FCNTL_F_CLOSEM
fcntl(next_fd, F_CLOSEM);
-#elif defined(HAVE_CLOSEFROM)
+#elif HAVE_CLOSEFROM
closefrom(next_fd);
-#else
+#else
for (i=sysconf(_SC_OPEN_MAX); i >= next_fd; i--) {
close(i);
}
-#endif
+#endif
/* Move to root directory. For debug we stay
* in current directory so dumps go there.
diff --git a/src/lib/devlock.c b/src/lib/devlock.c
index ca8dcb6..606449f 100644
--- a/src/lib/devlock.c
+++ b/src/lib/devlock.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/devlock.h b/src/lib/devlock.h
index 7c3812c..7824d0d 100644
--- a/src/lib/devlock.h
+++ b/src/lib/devlock.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/dlist.c b/src/lib/dlist.c
index 6ac67d7..5e821ba 100644
--- a/src/lib/dlist.c
+++ b/src/lib/dlist.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/dlist.h b/src/lib/dlist.h
index b5d7e06..414999c 100644
--- a/src/lib/dlist.h
+++ b/src/lib/dlist.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/edit.c b/src/lib/edit.c
index 6e3cd09..f419ab4 100644
--- a/src/lib/edit.c
+++ b/src/lib/edit.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/guid_to_name.c b/src/lib/guid_to_name.c
index 3db8e8a..fe9c244 100644
--- a/src/lib/guid_to_name.c
+++ b/src/lib/guid_to_name.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/guid_to_name.h b/src/lib/guid_to_name.h
index bfbecfe..5c9d63d 100644
--- a/src/lib/guid_to_name.h
+++ b/src/lib/guid_to_name.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/hmac.c b/src/lib/hmac.c
index a4e132f..a8d5e3d 100644
--- a/src/lib/hmac.c
+++ b/src/lib/hmac.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/htable.c b/src/lib/htable.c
index 2c60147..e5ceea1 100644
--- a/src/lib/htable.c
+++ b/src/lib/htable.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/htable.h b/src/lib/htable.h
index 73c6eb6..31b20a0 100644
--- a/src/lib/htable.h
+++ b/src/lib/htable.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -70,8 +69,8 @@ struct hlink {
struct h_mem {
struct h_mem *next; /* next buffer */
- char *mem; /* memory pointer */
- int32_t rem; /* remaining bytes in big_buffer */
+ char *mem; /* memory pointer */
+ int64_t rem; /* remaining bytes in big_buffer */
char first[1]; /* first byte */
};
diff --git a/src/lib/ini.c b/src/lib/ini.c
index b585b1b..b4da3a0 100644
--- a/src/lib/ini.c
+++ b/src/lib/ini.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2010-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/ini.h b/src/lib/ini.h
index 851a578..f6e86c8 100644
--- a/src/lib/ini.h
+++ b/src/lib/ini.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2010-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/jcr.c b/src/lib/jcr.c
index b99041d..3ec16c2 100644
--- a/src/lib/jcr.c
+++ b/src/lib/jcr.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/lex.c b/src/lib/lex.c
index a337757..8221698 100644
--- a/src/lib/lex.c
+++ b/src/lib/lex.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/lex.h b/src/lib/lex.h
index 17afcda..a6aeb91 100644
--- a/src/lib/lex.h
+++ b/src/lib/lex.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/lib.h b/src/lib/lib.h
index cdeeeee..9ad722b 100644
--- a/src/lib/lib.h
+++ b/src/lib/lib.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/lockmgr.c b/src/lib/lockmgr.c
index 109a7ee..81c5485 100644
--- a/src/lib/lockmgr.c
+++ b/src/lib/lockmgr.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2008-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/lockmgr.h b/src/lib/lockmgr.h
index 6cc2e4f..3948649 100644
--- a/src/lib/lockmgr.h
+++ b/src/lib/lockmgr.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2008-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/md5.c b/src/lib/md5.c
index 09bafa2..c838cfe 100644
--- a/src/lib/md5.c
+++ b/src/lib/md5.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/md5.h b/src/lib/md5.h
index a0414ba..f1f5a8e 100644
--- a/src/lib/md5.h
+++ b/src/lib/md5.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/mem_pool.c b/src/lib/mem_pool.c
index 7f8f86d..fd748e7 100644
--- a/src/lib/mem_pool.c
+++ b/src/lib/mem_pool.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/mem_pool.h b/src/lib/mem_pool.h
index 0d4fccf..b724bb3 100644
--- a/src/lib/mem_pool.h
+++ b/src/lib/mem_pool.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/message.c b/src/lib/message.c
index 4c32a12..ead4ca0 100644
--- a/src/lib/message.c
+++ b/src/lib/message.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -602,7 +601,6 @@ void close_msg(JCR *jcr)
break;
}
success = jcr && (jcr->JobStatus == JS_Terminated || jcr->JobStatus == JS_Warnings);
-
if (d->dest_code == MD_MAIL_ON_ERROR && success) {
goto rem_temp_file; /* no mail */
} else if (d->dest_code == MD_MAIL_ON_SUCCESS && !success) {
@@ -1329,6 +1327,7 @@ e_msg(const char *file, int line, int type, int level, const char *fmt,...)
dispatch_message(NULL, type, 0, buf);
if (type == M_ABORT) {
+ assert_msg = bstrdup(buf);
char *p = 0;
p[0] = 0; /* generate segmentation violation */
}
@@ -1448,6 +1447,7 @@ Jmsg(JCR *jcr, int type, utime_t mtime, const char *fmt,...)
char *p = 0;
printf("Bacula forced SEG FAULT to obtain traceback.\n");
syslog(LOG_DAEMON|LOG_ERR, "Bacula forced SEG FAULT to obtain traceback.\n");
+ assert_msg = bstrdup(rbuf);
p[0] = 0; /* generate segmentation violation */
}
if (type == M_ERROR_TERM) {
diff --git a/src/lib/message.h b/src/lib/message.h
index 32b4845..365ec24 100644
--- a/src/lib/message.h
+++ b/src/lib/message.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/mutex_list.h b/src/lib/mutex_list.h
index 11a2ee7..759c960 100644
--- a/src/lib/mutex_list.h
+++ b/src/lib/mutex_list.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2009-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/openssl.c b/src/lib/openssl.c
index 985a78a..64b0e96 100644
--- a/src/lib/openssl.c
+++ b/src/lib/openssl.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/openssl.h b/src/lib/openssl.h
index 4e93cf0..597517a 100644
--- a/src/lib/openssl.h
+++ b/src/lib/openssl.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/parse_conf.c b/src/lib/parse_conf.c
index eb86e8a..26d8140 100644
--- a/src/lib/parse_conf.c
+++ b/src/lib/parse_conf.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/parse_conf.h b/src/lib/parse_conf.h
index 59931a3..9b147d6 100644
--- a/src/lib/parse_conf.h
+++ b/src/lib/parse_conf.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/plugins.c b/src/lib/plugins.c
index 95ec2b1..9234c25 100644
--- a/src/lib/plugins.c
+++ b/src/lib/plugins.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/plugins.h b/src/lib/plugins.h
index cd5470d..d4640f2 100644
--- a/src/lib/plugins.h
+++ b/src/lib/plugins.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/priv.c b/src/lib/priv.c
index 663b466..ba07529 100644
--- a/src/lib/priv.c
+++ b/src/lib/priv.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/protos.h b/src/lib/protos.h
index c26df09..067ec82 100644
--- a/src/lib/protos.h
+++ b/src/lib/protos.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/queue.c b/src/lib/queue.c
index 4ad37b0..c703546 100644
--- a/src/lib/queue.c
+++ b/src/lib/queue.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/queue.h b/src/lib/queue.h
index a3fa685..c64754b 100644
--- a/src/lib/queue.h
+++ b/src/lib/queue.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/rblist.c b/src/lib/rblist.c
index 04a142b..10d8a8d 100644
--- a/src/lib/rblist.c
+++ b/src/lib/rblist.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/rblist.h b/src/lib/rblist.h
index d4e1de1..2c651d9 100644
--- a/src/lib/rblist.h
+++ b/src/lib/rblist.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/res.c b/src/lib/res.c
index dff2006..74598dc 100644
--- a/src/lib/res.c
+++ b/src/lib/res.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/runscript.c b/src/lib/runscript.c
index 95536ab..bbe7ce0 100644
--- a/src/lib/runscript.c
+++ b/src/lib/runscript.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/runscript.h b/src/lib/runscript.h
index 900c15c..98b4d51 100644
--- a/src/lib/runscript.h
+++ b/src/lib/runscript.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/rwlock.c b/src/lib/rwlock.c
index cbad3be..5397511 100644
--- a/src/lib/rwlock.c
+++ b/src/lib/rwlock.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/rwlock.h b/src/lib/rwlock.h
index f6a1178..a366202 100644
--- a/src/lib/rwlock.h
+++ b/src/lib/rwlock.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/scan.c b/src/lib/scan.c
index bbedc68..c29e82b 100644
--- a/src/lib/scan.c
+++ b/src/lib/scan.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/sellist.c b/src/lib/sellist.c
index 7fb221e..d8f1390 100644
--- a/src/lib/sellist.c
+++ b/src/lib/sellist.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2011-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/sellist.h b/src/lib/sellist.h
index e0386a1..ba554d0 100644
--- a/src/lib/sellist.h
+++ b/src/lib/sellist.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2011-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/serial.c b/src/lib/serial.c
index 2375ba6..a7d6255 100644
--- a/src/lib/serial.c
+++ b/src/lib/serial.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/serial.h b/src/lib/serial.h
index 75324b3..f8ad5d3 100644
--- a/src/lib/serial.h
+++ b/src/lib/serial.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/signal.c b/src/lib/signal.c
index a9c4d1a..4125839 100644
--- a/src/lib/signal.c
+++ b/src/lib/signal.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/smartall.c b/src/lib/smartall.c
index 6f77db1..0d4ecb7 100644
--- a/src/lib/smartall.c
+++ b/src/lib/smartall.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/smartall.h b/src/lib/smartall.h
index d40c731..7878183 100644
--- a/src/lib/smartall.h
+++ b/src/lib/smartall.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/status.h b/src/lib/status.h
index 5028480..59271f7 100644
--- a/src/lib/status.h
+++ b/src/lib/status.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2008-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/tls.c b/src/lib/tls.c
index 0c9c761..2fb8ec1 100644
--- a/src/lib/tls.c
+++ b/src/lib/tls.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/tls.h b/src/lib/tls.h
index 5747ddd..45fdd19 100644
--- a/src/lib/tls.h
+++ b/src/lib/tls.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/tree.c b/src/lib/tree.c
index 81fdfe5..04e90c4 100644
--- a/src/lib/tree.c
+++ b/src/lib/tree.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/tree.h b/src/lib/tree.h
index dd70d2f..5451eb2 100644
--- a/src/lib/tree.h
+++ b/src/lib/tree.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/util.c b/src/lib/util.c
index 4267354..4456c80 100644
--- a/src/lib/util.c
+++ b/src/lib/util.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/var.c b/src/lib/var.c
index 644afda..510deeb 100644
--- a/src/lib/var.c
+++ b/src/lib/var.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/waitq.h b/src/lib/waitq.h
index 4059ee3..7d62ecc 100644
--- a/src/lib/waitq.h
+++ b/src/lib/waitq.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/watchdog.c b/src/lib/watchdog.c
index 8ee7761..5a7cd9c 100644
--- a/src/lib/watchdog.c
+++ b/src/lib/watchdog.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/watchdog.h b/src/lib/watchdog.h
index 8298d63..d6b47e2 100644
--- a/src/lib/watchdog.h
+++ b/src/lib/watchdog.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/workq.c b/src/lib/workq.c
index 36bdd5c..bfed633 100644
--- a/src/lib/workq.c
+++ b/src/lib/workq.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/lib/workq.h b/src/lib/workq.h
index 9a1b405..a879834 100644
--- a/src/lib/workq.h
+++ b/src/lib/workq.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/bat.h b/src/qt-console/bat.h
index 214ac7d..5280d18 100644
--- a/src/qt-console/bat.h
+++ b/src/qt-console/bat.h
@@ -4,8 +4,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/bat_conf.cpp b/src/qt-console/bat_conf.cpp
index 429cf4d..0f8dcc2 100644
--- a/src/qt-console/bat_conf.cpp
+++ b/src/qt-console/bat_conf.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2013 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/bat_conf.h b/src/qt-console/bat_conf.h
index 143168c..7fa7a19 100644
--- a/src/qt-console/bat_conf.h
+++ b/src/qt-console/bat_conf.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/bcomm/dircomm.cpp b/src/qt-console/bcomm/dircomm.cpp
index 5591064..d9e22a0 100644
--- a/src/qt-console/bcomm/dircomm.cpp
+++ b/src/qt-console/bcomm/dircomm.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2011 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/bcomm/dircomm.h b/src/qt-console/bcomm/dircomm.h
index 5d64461..54ce58d 100644
--- a/src/qt-console/bcomm/dircomm.h
+++ b/src/qt-console/bcomm/dircomm.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/bcomm/dircomm_auth.cpp b/src/qt-console/bcomm/dircomm_auth.cpp
index 32ac44c..8c24ca3 100644
--- a/src/qt-console/bcomm/dircomm_auth.cpp
+++ b/src/qt-console/bcomm/dircomm_auth.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2013 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/clients/clients.cpp b/src/qt-console/clients/clients.cpp
index b9c2ea8..37f288a 100644
--- a/src/qt-console/clients/clients.cpp
+++ b/src/qt-console/clients/clients.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/clients/clients.h b/src/qt-console/clients/clients.h
index cbb593e..4ecdc00 100644
--- a/src/qt-console/clients/clients.h
+++ b/src/qt-console/clients/clients.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/console/console.cpp b/src/qt-console/console/console.cpp
index eb8ef45..a183b91 100644
--- a/src/qt-console/console/console.cpp
+++ b/src/qt-console/console/console.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/console/console.h b/src/qt-console/console/console.h
index e5e6c3a..0468676 100644
--- a/src/qt-console/console/console.h
+++ b/src/qt-console/console/console.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/fileset/fileset.cpp b/src/qt-console/fileset/fileset.cpp
index 1a8a3f9..5287c94 100644
--- a/src/qt-console/fileset/fileset.cpp
+++ b/src/qt-console/fileset/fileset.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/fileset/fileset.h b/src/qt-console/fileset/fileset.h
index 90f33b0..c6f431a 100644
--- a/src/qt-console/fileset/fileset.h
+++ b/src/qt-console/fileset/fileset.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/help/help.cpp b/src/qt-console/help/help.cpp
index 3e99563..2967ce1 100644
--- a/src/qt-console/help/help.cpp
+++ b/src/qt-console/help/help.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/help/help.h b/src/qt-console/help/help.h
index 3d11ef7..c6e0ff5 100644
--- a/src/qt-console/help/help.h
+++ b/src/qt-console/help/help.h
@@ -4,8 +4,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/job/job.cpp b/src/qt-console/job/job.cpp
index 515ed47..67ad1b4 100644
--- a/src/qt-console/job/job.cpp
+++ b/src/qt-console/job/job.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/job/job.h b/src/qt-console/job/job.h
index 44d328a..7f14463 100644
--- a/src/qt-console/job/job.h
+++ b/src/qt-console/job/job.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/jobgraphs/jobplot.cpp b/src/qt-console/jobgraphs/jobplot.cpp
index 1b14e41..abb0b46 100644
--- a/src/qt-console/jobgraphs/jobplot.cpp
+++ b/src/qt-console/jobgraphs/jobplot.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/jobgraphs/jobplot.h b/src/qt-console/jobgraphs/jobplot.h
index 4297b4b..86a6048 100644
--- a/src/qt-console/jobgraphs/jobplot.h
+++ b/src/qt-console/jobgraphs/jobplot.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/joblist/joblist.cpp b/src/qt-console/joblist/joblist.cpp
index 4afbb68..4440722 100644
--- a/src/qt-console/joblist/joblist.cpp
+++ b/src/qt-console/joblist/joblist.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/joblist/joblist.h b/src/qt-console/joblist/joblist.h
index 1a154ba..bc41762 100644
--- a/src/qt-console/joblist/joblist.h
+++ b/src/qt-console/joblist/joblist.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/joblog/joblog.cpp b/src/qt-console/joblog/joblog.cpp
index 11d8bb9..46ae554 100644
--- a/src/qt-console/joblog/joblog.cpp
+++ b/src/qt-console/joblog/joblog.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/joblog/joblog.h b/src/qt-console/joblog/joblog.h
index 27d6bbb..255276e 100644
--- a/src/qt-console/joblog/joblog.h
+++ b/src/qt-console/joblog/joblog.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/jobs/jobs.cpp b/src/qt-console/jobs/jobs.cpp
index edb6217..a6df56e 100644
--- a/src/qt-console/jobs/jobs.cpp
+++ b/src/qt-console/jobs/jobs.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/jobs/jobs.h b/src/qt-console/jobs/jobs.h
index 425a398..8622c95 100644
--- a/src/qt-console/jobs/jobs.h
+++ b/src/qt-console/jobs/jobs.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/label/label.cpp b/src/qt-console/label/label.cpp
index fae53a7..664d0e5 100644
--- a/src/qt-console/label/label.cpp
+++ b/src/qt-console/label/label.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2011 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/label/label.h b/src/qt-console/label/label.h
index ff87637..1fa7415 100644
--- a/src/qt-console/label/label.h
+++ b/src/qt-console/label/label.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/main.cpp b/src/qt-console/main.cpp
index 9e8c723..162e2c5 100644
--- a/src/qt-console/main.cpp
+++ b/src/qt-console/main.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/mainwin.cpp b/src/qt-console/mainwin.cpp
index 835f715..27d477d 100644
--- a/src/qt-console/mainwin.cpp
+++ b/src/qt-console/mainwin.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/mainwin.h b/src/qt-console/mainwin.h
index 3d96e76..a88c79d 100644
--- a/src/qt-console/mainwin.h
+++ b/src/qt-console/mainwin.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/mediaedit/mediaedit.cpp b/src/qt-console/mediaedit/mediaedit.cpp
index 783c6da..9662e37 100644
--- a/src/qt-console/mediaedit/mediaedit.cpp
+++ b/src/qt-console/mediaedit/mediaedit.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/mediaedit/mediaedit.h b/src/qt-console/mediaedit/mediaedit.h
index 7aa986e..5856f30 100644
--- a/src/qt-console/mediaedit/mediaedit.h
+++ b/src/qt-console/mediaedit/mediaedit.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/mediainfo/mediainfo.cpp b/src/qt-console/mediainfo/mediainfo.cpp
index 6184d40..e6cb853 100644
--- a/src/qt-console/mediainfo/mediainfo.cpp
+++ b/src/qt-console/mediainfo/mediainfo.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/mediainfo/mediainfo.h b/src/qt-console/mediainfo/mediainfo.h
index 0e64d5d..af5d5b8 100644
--- a/src/qt-console/mediainfo/mediainfo.h
+++ b/src/qt-console/mediainfo/mediainfo.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/medialist/medialist.cpp b/src/qt-console/medialist/medialist.cpp
index e9adb2a..b8a255f 100644
--- a/src/qt-console/medialist/medialist.cpp
+++ b/src/qt-console/medialist/medialist.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/medialist/medialist.h b/src/qt-console/medialist/medialist.h
index 7850540..0c3f674 100644
--- a/src/qt-console/medialist/medialist.h
+++ b/src/qt-console/medialist/medialist.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/medialist/mediaview.cpp b/src/qt-console/medialist/mediaview.cpp
index 5650a26..8636e83 100644
--- a/src/qt-console/medialist/mediaview.cpp
+++ b/src/qt-console/medialist/mediaview.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -108,7 +107,7 @@ void MediaView::purgePushed()
bool MediaView::getSelection(QStringList &list)
{
QTableWidgetItem *it;
- QList<QTableWidgetItem*> items = m_tableMedia->selectedItems();
+ QList<QTableWidgetItem*> items = m_tableMedia->selectedItems();
int row;
int nrows; /* number of rows */
bool *tab;
@@ -122,7 +121,7 @@ bool MediaView::getSelection(QStringList &list)
for (int i = 0; i < nb; ++i) {
row = items[i]->row();
if (!tab[row]) {
- tab[row] = true;
+ tab[row] = true;
it = m_tableMedia->item(row, 0);
list.append(it->text());
}
diff --git a/src/qt-console/medialist/mediaview.h b/src/qt-console/medialist/mediaview.h
index 0b41717..e2808c0 100644
--- a/src/qt-console/medialist/mediaview.h
+++ b/src/qt-console/medialist/mediaview.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/mount/mount.cpp b/src/qt-console/mount/mount.cpp
index 475e486..2d466e1 100644
--- a/src/qt-console/mount/mount.cpp
+++ b/src/qt-console/mount/mount.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/mount/mount.h b/src/qt-console/mount/mount.h
index 9706d2b..4703c98 100644
--- a/src/qt-console/mount/mount.h
+++ b/src/qt-console/mount/mount.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/pages.cpp b/src/qt-console/pages.cpp
index d21a76e..05713da 100644
--- a/src/qt-console/pages.cpp
+++ b/src/qt-console/pages.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2011 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/pages.h b/src/qt-console/pages.h
index 997207a..4c5ef5d 100644
--- a/src/qt-console/pages.h
+++ b/src/qt-console/pages.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/relabel/relabel.cpp b/src/qt-console/relabel/relabel.cpp
index aeace6c..b416f7a 100644
--- a/src/qt-console/relabel/relabel.cpp
+++ b/src/qt-console/relabel/relabel.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/relabel/relabel.h b/src/qt-console/relabel/relabel.h
index 746ba3c..105d627 100644
--- a/src/qt-console/relabel/relabel.h
+++ b/src/qt-console/relabel/relabel.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/restore/brestore.cpp b/src/qt-console/restore/brestore.cpp
index 7503fb2..341a998 100644
--- a/src/qt-console/restore/brestore.cpp
+++ b/src/qt-console/restore/brestore.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2011 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/restore/prerestore.cpp b/src/qt-console/restore/prerestore.cpp
index 482c8d1..88c67fc 100644
--- a/src/qt-console/restore/prerestore.cpp
+++ b/src/qt-console/restore/prerestore.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/restore/restore.cpp b/src/qt-console/restore/restore.cpp
index 70cc299..c8c0770 100644
--- a/src/qt-console/restore/restore.cpp
+++ b/src/qt-console/restore/restore.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/restore/restore.h b/src/qt-console/restore/restore.h
index 8710635..7ece0af 100644
--- a/src/qt-console/restore/restore.h
+++ b/src/qt-console/restore/restore.h
@@ -4,8 +4,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/restore/restoretree.cpp b/src/qt-console/restore/restoretree.cpp
index 0bc9172..d32270c 100644
--- a/src/qt-console/restore/restoretree.cpp
+++ b/src/qt-console/restore/restoretree.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/restore/restoretree.h b/src/qt-console/restore/restoretree.h
index ae39d3c..74b9f2f 100644
--- a/src/qt-console/restore/restoretree.h
+++ b/src/qt-console/restore/restoretree.h
@@ -4,8 +4,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/run/estimate.cpp b/src/qt-console/run/estimate.cpp
index 9aa894e..8a31697 100644
--- a/src/qt-console/run/estimate.cpp
+++ b/src/qt-console/run/estimate.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/run/prune.cpp b/src/qt-console/run/prune.cpp
index 94e08c7..6495577 100644
--- a/src/qt-console/run/prune.cpp
+++ b/src/qt-console/run/prune.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/run/run.cpp b/src/qt-console/run/run.cpp
index a86f526..c8199e5 100644
--- a/src/qt-console/run/run.cpp
+++ b/src/qt-console/run/run.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2011 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/run/run.h b/src/qt-console/run/run.h
index 59d037b..ad9329c 100644
--- a/src/qt-console/run/run.h
+++ b/src/qt-console/run/run.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/run/runcmd.cpp b/src/qt-console/run/runcmd.cpp
index 6ce39ce..c7616b0 100644
--- a/src/qt-console/run/runcmd.cpp
+++ b/src/qt-console/run/runcmd.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/select/select.cpp b/src/qt-console/select/select.cpp
index 8d628de..f026920 100644
--- a/src/qt-console/select/select.cpp
+++ b/src/qt-console/select/select.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/select/select.h b/src/qt-console/select/select.h
index a4377fc..4589cc0 100644
--- a/src/qt-console/select/select.h
+++ b/src/qt-console/select/select.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/select/textinput.cpp b/src/qt-console/select/textinput.cpp
index 691f646..a32e1ff 100644
--- a/src/qt-console/select/textinput.cpp
+++ b/src/qt-console/select/textinput.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/select/textinput.h b/src/qt-console/select/textinput.h
index 83fb93e..5165de9 100644
--- a/src/qt-console/select/textinput.h
+++ b/src/qt-console/select/textinput.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/status/clientstat.cpp b/src/qt-console/status/clientstat.cpp
index 97393a9..d11ae97 100644
--- a/src/qt-console/status/clientstat.cpp
+++ b/src/qt-console/status/clientstat.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/status/clientstat.h b/src/qt-console/status/clientstat.h
index f88dfa9..eb44b38 100644
--- a/src/qt-console/status/clientstat.h
+++ b/src/qt-console/status/clientstat.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/status/dirstat.cpp b/src/qt-console/status/dirstat.cpp
index 1747f4c..e7db91d 100644
--- a/src/qt-console/status/dirstat.cpp
+++ b/src/qt-console/status/dirstat.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/status/dirstat.h b/src/qt-console/status/dirstat.h
index c83c918..f99634c 100644
--- a/src/qt-console/status/dirstat.h
+++ b/src/qt-console/status/dirstat.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/status/storstat.cpp b/src/qt-console/status/storstat.cpp
index 86eff95..5eb326e 100644
--- a/src/qt-console/status/storstat.cpp
+++ b/src/qt-console/status/storstat.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/status/storstat.h b/src/qt-console/status/storstat.h
index 55bd74a..86516c6 100644
--- a/src/qt-console/status/storstat.h
+++ b/src/qt-console/status/storstat.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/storage/content.cpp b/src/qt-console/storage/content.cpp
index fe3acf7..f8e937d 100644
--- a/src/qt-console/storage/content.cpp
+++ b/src/qt-console/storage/content.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -274,13 +273,13 @@ void Content::populateContent()
/* Get count of rows needed (Drives) */
QStringList drives = results_all.filter(QRegExp("^D\\|[0-9]+\\|"));
/* Ensure we have sufficient rows for Drive display */
- tableDrive->setRowCount(drives.size());
+ tableDrive->setRowCount(drives.size());
row = 0;
foreach (resultline, drives) {
fieldlist = resultline.split("|");
- if (fieldlist.size() < 4) {
+ if (fieldlist.size() < 4) {
continue; /* some fields missing, ignore row */
- }
+ }
int index=0;
QStringListIterator fld(fieldlist);
TableItemFormatter slotitem(*tableDrive, row);
diff --git a/src/qt-console/storage/content.h b/src/qt-console/storage/content.h
index 854cb55..7877095 100644
--- a/src/qt-console/storage/content.h
+++ b/src/qt-console/storage/content.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/storage/storage.cpp b/src/qt-console/storage/storage.cpp
index 9f5dc22..a21f995 100644
--- a/src/qt-console/storage/storage.cpp
+++ b/src/qt-console/storage/storage.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/storage/storage.h b/src/qt-console/storage/storage.h
index 7ff77e6..a747f2a 100644
--- a/src/qt-console/storage/storage.h
+++ b/src/qt-console/storage/storage.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/tray-monitor/authenticate.cpp b/src/qt-console/tray-monitor/authenticate.cpp
index dde4682..f78861a 100644
--- a/src/qt-console/tray-monitor/authenticate.cpp
+++ b/src/qt-console/tray-monitor/authenticate.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2004-2013 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/tray-monitor/tray-monitor.cpp b/src/qt-console/tray-monitor/tray-monitor.cpp
index 590a1c0..d63314b 100644
--- a/src/qt-console/tray-monitor/tray-monitor.cpp
+++ b/src/qt-console/tray-monitor/tray-monitor.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2004-2013 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/tray-monitor/tray-monitor.h b/src/qt-console/tray-monitor/tray-monitor.h
index 0e03420..762c818 100644
--- a/src/qt-console/tray-monitor/tray-monitor.h
+++ b/src/qt-console/tray-monitor/tray-monitor.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/tray-monitor/tray-ui.h b/src/qt-console/tray-monitor/tray-ui.h
index ce2b22f..515bf0f 100644
--- a/src/qt-console/tray-monitor/tray-ui.h
+++ b/src/qt-console/tray-monitor/tray-ui.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2011-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/tray-monitor/tray_conf.cpp b/src/qt-console/tray-monitor/tray_conf.cpp
index ed6643f..a1e35ce 100644
--- a/src/qt-console/tray-monitor/tray_conf.cpp
+++ b/src/qt-console/tray-monitor/tray_conf.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/tray-monitor/tray_conf.h b/src/qt-console/tray-monitor/tray_conf.h
index 38320a0..1bfd554 100644
--- a/src/qt-console/tray-monitor/tray_conf.h
+++ b/src/qt-console/tray-monitor/tray_conf.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/util/comboutil.cpp b/src/qt-console/util/comboutil.cpp
index cd78b93..d388a28 100644
--- a/src/qt-console/util/comboutil.cpp
+++ b/src/qt-console/util/comboutil.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/util/comboutil.h b/src/qt-console/util/comboutil.h
index 8933b4f..e782315 100644
--- a/src/qt-console/util/comboutil.h
+++ b/src/qt-console/util/comboutil.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/qt-console/util/fmtwidgetitem.cpp b/src/qt-console/util/fmtwidgetitem.cpp
index aebd111..1fbc4d3 100644
--- a/src/qt-console/util/fmtwidgetitem.cpp
+++ b/src/qt-console/util/fmtwidgetitem.cpp
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -120,9 +119,10 @@ QString convertBytesIEC(qint64 qfld)
return QString("%1 B").arg(qfld);
}
- /* having divided for a smaller unit, now we can safely convert to double and
- use the extra room for decimals */
- return QString("%1 %2iB").arg(qfld / 1024.0, 0, 'f', 2).arg(suffix);
+ /* After dividing into a smaller value, we can safely convert from
+ * to a double double and use the extra room for decimals
+ */
+ return QString("%1 %2iB").arg(qfld / 1024.0, 0, 'f', 2).arg(suffix);
}
/* String to human value based on k=1000 */
@@ -135,7 +135,7 @@ QString convertBytesSI(qint64 qfld)
static const qint64 PB = (TB * KB);
static const qint64 EB = (PB * KB);
- /* note: division is integer, so to have some decimals we divide for a
+ /* Note: division is integer, so to have some decimals we divide for a
smaller unit (e.g. GB for a TB number and so on) */
char suffix;
if (qfld >= EB) {
diff --git a/src/qt-console/util/fmtwidgetitem.h b/src/qt-console/util/fmtwidgetitem.h
index 6dd5e12..859977d 100644
--- a/src/qt-console/util/fmtwidgetitem.h
+++ b/src/qt-console/util/fmtwidgetitem.h
@@ -3,8 +3,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/acquire.c b/src/stored/acquire.c
index 153843c..c1229d2 100644
--- a/src/stored/acquire.c
+++ b/src/stored/acquire.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/ansi_label.c b/src/stored/ansi_label.c
index 516c925..8bbc917 100644
--- a/src/stored/ansi_label.c
+++ b/src/stored/ansi_label.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/append.c b/src/stored/append.c
index 973476a..ad8d28f 100644
--- a/src/stored/append.c
+++ b/src/stored/append.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/askdir.c b/src/stored/askdir.c
index b7e9ba4..d60ae10 100644
--- a/src/stored/askdir.c
+++ b/src/stored/askdir.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/authenticate.c b/src/stored/authenticate.c
index 7572cd7..a1dc2fa 100644
--- a/src/stored/authenticate.c
+++ b/src/stored/authenticate.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/autochanger.c b/src/stored/autochanger.c
index 4060056..cac14b7 100644
--- a/src/stored/autochanger.c
+++ b/src/stored/autochanger.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/bcopy.c b/src/stored/bcopy.c
index eaac36e..26bcde1 100644
--- a/src/stored/bcopy.c
+++ b/src/stored/bcopy.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/bextract.c b/src/stored/bextract.c
index b0b16df..717ceca 100644
--- a/src/stored/bextract.c
+++ b/src/stored/bextract.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/block.c b/src/stored/block.c
index b74027b..3bc9dae 100644
--- a/src/stored/block.c
+++ b/src/stored/block.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/block.h b/src/stored/block.h
index a8552b0..2217662 100644
--- a/src/stored/block.h
+++ b/src/stored/block.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/block_util.c b/src/stored/block_util.c
index 11f3cf2..cedcc8d 100644
--- a/src/stored/block_util.c
+++ b/src/stored/block_util.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/bls.c b/src/stored/bls.c
index e677004..ced3692 100644
--- a/src/stored/bls.c
+++ b/src/stored/bls.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/bscan.c b/src/stored/bscan.c
index 4757fb0..ca3653a 100644
--- a/src/stored/bscan.c
+++ b/src/stored/bscan.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/bsr.h b/src/stored/bsr.h
index 568bfe9..344f8e0 100644
--- a/src/stored/bsr.h
+++ b/src/stored/bsr.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/btape.c b/src/stored/btape.c
index f4fa3aa..5817520 100644
--- a/src/stored/btape.c
+++ b/src/stored/btape.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/butil.c b/src/stored/butil.c
index bc9d14a..b380dc8 100644
--- a/src/stored/butil.c
+++ b/src/stored/butil.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/dev.c b/src/stored/dev.c
index 2ff57f8..8d07f4f 100644
--- a/src/stored/dev.c
+++ b/src/stored/dev.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -249,7 +248,7 @@ DEVICE *m_init_dev(JCR *jcr, DEVRES *device)
/* Keep the device ID in the DEVICE struct to identify the hardware */
if (dev->is_file() && stat(dev->archive_name(), &statp) == 0) {
dev->devno = statp.st_dev;
- }
+ }
/* Sanity check */
if (dev->max_block_size == 0) {
@@ -753,7 +752,7 @@ bool DEVICE::close()
print_name(), be.bstrerror());
ok = false;
}
- break;
+ break;
}
unmount(1); /* do unmount if required */
diff --git a/src/stored/dev.h b/src/stored/dev.h
index ef24f3e..1371e38 100644
--- a/src/stored/dev.h
+++ b/src/stored/dev.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/device.c b/src/stored/device.c
index e2b31f5..be01f9a 100644
--- a/src/stored/device.c
+++ b/src/stored/device.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/dircmd.c b/src/stored/dircmd.c
index abf9f1a..c7b0314 100644
--- a/src/stored/dircmd.c
+++ b/src/stored/dircmd.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/ebcdic.c b/src/stored/ebcdic.c
index 1a4d265..eddcddc 100644
--- a/src/stored/ebcdic.c
+++ b/src/stored/ebcdic.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/fd_cmds.c b/src/stored/fd_cmds.c
index d966250..630f5e0 100644
--- a/src/stored/fd_cmds.c
+++ b/src/stored/fd_cmds.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/file_dev.c b/src/stored/file_dev.c
index 09cee35..9dfc226 100644
--- a/src/stored/file_dev.c
+++ b/src/stored/file_dev.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/file_dev.h b/src/stored/file_dev.h
index 6dcbaee..6f76560 100644
--- a/src/stored/file_dev.h
+++ b/src/stored/file_dev.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/hello.c b/src/stored/hello.c
index f0f3f03..83e9d15 100644
--- a/src/stored/hello.c
+++ b/src/stored/hello.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/job.c b/src/stored/job.c
index 168c75b..7217685 100644
--- a/src/stored/job.c
+++ b/src/stored/job.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/label.c b/src/stored/label.c
index 00112f3..1c2e74a 100644
--- a/src/stored/label.c
+++ b/src/stored/label.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/lock.c b/src/stored/lock.c
index 0fea988..f5f6498 100644
--- a/src/stored/lock.c
+++ b/src/stored/lock.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/lock.h b/src/stored/lock.h
index 2376ff7..e795d0e 100644
--- a/src/stored/lock.h
+++ b/src/stored/lock.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/match_bsr.c b/src/stored/match_bsr.c
index 208a9a3..85cd565 100644
--- a/src/stored/match_bsr.c
+++ b/src/stored/match_bsr.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/mount.c b/src/stored/mount.c
index a93e0e7..4b81019 100644
--- a/src/stored/mount.c
+++ b/src/stored/mount.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2002-2015 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/os.c b/src/stored/os.c
index 9f853b8..2f754eb 100644
--- a/src/stored/os.c
+++ b/src/stored/os.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/parse_bsr.c b/src/stored/parse_bsr.c
index 69f73c7..049f412 100644
--- a/src/stored/parse_bsr.c
+++ b/src/stored/parse_bsr.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/protos.h b/src/stored/protos.h
index 3b7d36c..adfdbcf 100644
--- a/src/stored/protos.h
+++ b/src/stored/protos.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/read.c b/src/stored/read.c
index 329cd59..a20db85 100644
--- a/src/stored/read.c
+++ b/src/stored/read.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/read_records.c b/src/stored/read_records.c
index 3987cb0..b42b181 100644
--- a/src/stored/read_records.c
+++ b/src/stored/read_records.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/record.h b/src/stored/record.h
index 16fb0f6..36113d6 100644
--- a/src/stored/record.h
+++ b/src/stored/record.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/record_read.c b/src/stored/record_read.c
index 5e001ce..b69f79c 100644
--- a/src/stored/record_read.c
+++ b/src/stored/record_read.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/record_util.c b/src/stored/record_util.c
index e708193..7c3c54d 100644
--- a/src/stored/record_util.c
+++ b/src/stored/record_util.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/record_write.c b/src/stored/record_write.c
index 45799bc..bebe074 100644
--- a/src/stored/record_write.c
+++ b/src/stored/record_write.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/reserve.c b/src/stored/reserve.c
index c5b3af4..aca0cc4 100644
--- a/src/stored/reserve.c
+++ b/src/stored/reserve.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/reserve.h b/src/stored/reserve.h
index cb51f80..4f3d7b3 100644
--- a/src/stored/reserve.h
+++ b/src/stored/reserve.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/scan.c b/src/stored/scan.c
index e4290b2..d5afc0e 100644
--- a/src/stored/scan.c
+++ b/src/stored/scan.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/sd_plugins.c b/src/stored/sd_plugins.c
index 58bedc5..b8550f2 100644
--- a/src/stored/sd_plugins.c
+++ b/src/stored/sd_plugins.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -101,14 +100,14 @@ int generate_plugin_event(JCR *jcr, bsdEventType eventType, void *value)
if (!b_plugin_list) {
Dmsg0(dbglvl, "No b_plugin_list: generate_plugin_event ignored.\n");
- return bRC_OK;
- }
- if (!jcr) {
- Dmsg0(dbglvl, "No jcr: generate_plugin_event ignored.\n");
- return bRC_OK;
- }
- if (!jcr->plugin_ctx_list) {
- Dmsg0(dbglvl, "No plugin_ctx_list: generate_plugin_event ignored.\n");
+ return bRC_OK;
+ }
+ if (!jcr) {
+ Dmsg0(dbglvl, "jcr==NULL: generate_plugin_event ignored.\n");
+ return bRC_OK;
+ }
+ if (!jcr->plugin_ctx_list) {
+ Dmsg0(dbglvl, "No plugin_ctx_list: generate_plugin_event ignored.\n");
return bRC_OK; /* Return if no plugins loaded */
}
@@ -289,12 +288,9 @@ void new_plugins(JCR *jcr)
if (jcr->is_job_canceled()) {
return;
}
- /*
- * If plugins already loaded, just return
- */
- if (jcr->plugin_ctx_list) {
- return;
- }
+
+ /* If plugins already loaded, just return */
+ if (jcr->plugin_ctx_list) return;
int num = b_plugin_list->size();
diff --git a/src/stored/sd_plugins.h b/src/stored/sd_plugins.h
index 742f699..1932f33 100644
--- a/src/stored/sd_plugins.h
+++ b/src/stored/sd_plugins.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/spool.c b/src/stored/spool.c
index 3e26fa7..db31745 100644
--- a/src/stored/spool.c
+++ b/src/stored/spool.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/status.c b/src/stored/status.c
index 2a8b7e6..9a7c173 100644
--- a/src/stored/status.c
+++ b/src/stored/status.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/stored.c b/src/stored/stored.c
index abf0d4f..a8d9dfc 100644
--- a/src/stored/stored.c
+++ b/src/stored/stored.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/stored.h b/src/stored/stored.h
index dc4eb5e..bc03b25 100644
--- a/src/stored/stored.h
+++ b/src/stored/stored.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/stored_conf.c b/src/stored/stored_conf.c
index 3480d73..c903c39 100644
--- a/src/stored/stored_conf.c
+++ b/src/stored/stored_conf.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/stored_conf.h b/src/stored/stored_conf.h
index a262f1f..9dee7ba 100644
--- a/src/stored/stored_conf.h
+++ b/src/stored/stored_conf.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/tape_dev.c b/src/stored/tape_dev.c
index 4afdd8b..212819a 100644
--- a/src/stored/tape_dev.c
+++ b/src/stored/tape_dev.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/tape_dev.h b/src/stored/tape_dev.h
index c4dd9ce..557e340 100644
--- a/src/stored/tape_dev.h
+++ b/src/stored/tape_dev.h
@@ -1,8 +1,7 @@
/* [vssfs.c] IQ
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/vbackup.c b/src/stored/vbackup.c
index b5715d3..49e15c2 100644
--- a/src/stored/vbackup.c
+++ b/src/stored/vbackup.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/vol_mgr.c b/src/stored/vol_mgr.c
index 0b71154..f4c9cdf 100644
--- a/src/stored/vol_mgr.c
+++ b/src/stored/vol_mgr.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -210,12 +209,13 @@ static void debug_list_volumes(const char *imsg)
foreach_vol(vol) {
if (vol->dev) {
- Mmsg(msg, "List %s: %s in_use=%d swap=%d on %s device %s\n", imsg,
+ Mmsg(msg, "List %s: %s in_use=%d swap=%d slot=%d on %s device %s\n", imsg,
vol->vol_name, vol->is_in_use(), vol->is_swapping(),
+ vol->get_slot(),
vol->dev->print_type(), vol->dev->print_name());
} else {
- Mmsg(msg, "List %s: %s in_use=%d swap=%d no dev\n", imsg, vol->vol_name,
- vol->is_in_use(), vol->is_swapping());
+ Mmsg(msg, "List %s: %s in_use=%d swap=%d slot=%d no dev\n", imsg, vol->vol_name,
+ vol->is_in_use(), vol->is_swapping(), vol->get_slot());
}
Dmsg1(dbglvl, "%s", msg.c_str());
}
@@ -282,8 +282,8 @@ static VOLRES *new_vol_item(DCR *dcr, const char *VolumeName)
vol->vol_name = bstrdup(VolumeName);
if (dcr) {
vol->dev = dcr->dev;
- Dmsg3(dbglvl, "new Vol=%s at %p dev=%s\n",
- VolumeName, vol->vol_name, vol->dev->print_name());
+ Dmsg4(dbglvl, "new Vol=%s slot=%d at %p dev=%s\n",
+ VolumeName, vol->get_slot(), vol->vol_name, vol->dev->print_name());
}
vol->init_mutex();
vol->inc_use_count();
@@ -408,8 +408,8 @@ VOLRES *reserve_volume(DCR *dcr, const char *VolumeName)
* is not being used and is marked as not reserved.
*/
if (strcmp(vol->vol_name, VolumeName) == 0) {
- Dmsg2(dbglvl, "set reserved vol=%s dev=%s\n", VolumeName,
- vol->dev->print_name());
+ Dmsg3(dbglvl, "set reserved vol=%s slot=%d dev=%s\n", VolumeName,
+ vol->get_slot(), vol->dev->print_name());
goto get_out; /* Volume already on this device */
} else {
/* Don't release a volume if it was reserved by someone other than us */
@@ -424,7 +424,7 @@ VOLRES *reserve_volume(DCR *dcr, const char *VolumeName)
Dmsg2(dbglvl, "reserve_vol free vol=%s at %p\n", vol->vol_name, vol->vol_name);
/* If old Volume is still mounted, must unload it */
if (strcmp(vol->vol_name, dev->VolHdr.VolumeName) == 0) {
- Dmsg0(50, "set_unload\n");
+ Dmsg2(50, "set_unload vol=%s slot=%d\n", vol->vol_name, vol->get_slot());
dev->set_unload(); /* have to unload current volume */
}
free_volume(dev); /* Release old volume entry */
@@ -490,7 +490,8 @@ VOLRES *reserve_volume(DCR *dcr, const char *VolumeName)
Dmsg3(dbglvl, "==== Swap vol=%s from dev=%s to %s\n",
VolumeName, vol->dev->print_name(), dev->print_name());
free_volume(dev); /* free any volume attached to our drive */
- Dmsg1(50, "set_unload dev=%s\n", dev->print_name());
+ Dmsg3(50, "set_unload vol=%s slot=%d dev=%s\n", vol->vol_name,
+ vol->get_slot(), dev->print_name());
dev->set_unload(); /* Unload any volume that is on our drive */
dcr->set_dev(vol->dev); /* temp point to other dev */
slot = get_autochanger_loaded_slot(dcr); /* get slot on other drive */
@@ -688,7 +689,8 @@ bool volume_unused(DCR *dcr)
return false;
}
- Dmsg1(dbglvl, "Clear in_use vol=%s\n", dev->vol->vol_name);
+ Dmsg2(dbglvl, "Clear in_use vol=%s slot=%d\n", dev->vol->vol_name,
+ dev->vol->get_slot());
dev->vol->clear_in_use();
if (dev->vol->is_swapping()) {
@@ -703,8 +705,9 @@ bool volume_unused(DCR *dcr)
* explicitly read in this drive. This allows the SD to remember
* where the tapes are or last were.
*/
- Dmsg4(dbglvl, "set not reserved vol=%s writers=%d reserves=%d dev=%s\n",
- dev->vol->vol_name, dev->num_writers, dev->num_reserved(), dev->print_name());
+ Dmsg5(dbglvl, "set not reserved vol=%s slot=%d writers=%d reserves=%d dev=%s\n",
+ dev->vol->vol_name, dev->vol->get_slot(), dev->num_writers,
+ dev->num_reserved(), dev->print_name());
if (dev->is_tape() || dev->is_autochanger()) {
return true;
} else {
@@ -734,12 +737,13 @@ bool free_volume(DEVICE *dev)
}
/* Don't free a volume while it is being swapped */
if (!vol->is_swapping()) {
- Dmsg1(dbglvl, "Clear in_use vol=%s\n", vol->vol_name);
+ Dmsg2(dbglvl, "Clear in_use vol=%s slot=%d\n", vol->vol_name, vol->get_slot());
dev->vol = NULL;
if (vol->is_writing()) {
vol_list->remove(vol);
}
- Dmsg2(dbglvl, "Remove volume %s dev=%s\n", vol->vol_name, dev->print_name());
+ Dmsg3(dbglvl, "Remove volume %s slot=%d dev=%s\n", vol->vol_name,
+ vol->get_slot(), dev->print_name());
free_vol_item(vol);
debug_list_volumes("free_volume");
} else {
diff --git a/src/stored/vol_mgr.h b/src/stored/vol_mgr.h
index f492c11..59045c5 100644
--- a/src/stored/vol_mgr.h
+++ b/src/stored/vol_mgr.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/vtape_dev.c b/src/stored/vtape_dev.c
index 429d4bd..1f9a03e 100644
--- a/src/stored/vtape_dev.c
+++ b/src/stored/vtape_dev.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2008-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/vtape_dev.h b/src/stored/vtape_dev.h
index a53738d..347e182 100644
--- a/src/stored/vtape_dev.h
+++ b/src/stored/vtape_dev.h
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2008-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/stored/wait.c b/src/stored/wait.c
index 018ed13..e664ee5 100644
--- a/src/stored/wait.c
+++ b/src/stored/wait.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/tools/bbatch.c b/src/tools/bbatch.c
index 1d4ac8d..7b0453f 100644
--- a/src/tools/bbatch.c
+++ b/src/tools/bbatch.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -107,7 +106,7 @@ static int list_handler(void *ctx, int num_fields, char **row)
int main (int argc, char *argv[])
{
int ch;
- bool disable_batch = false;
+ bool use_batch_insert = true;
char *restore_list=NULL;
setlocale(LC_ALL, "");
bindtextdomain("bacula", LOCALEDIR);
@@ -128,10 +127,10 @@ int main (int argc, char *argv[])
restore_list=bstrdup(optarg);
break;
case 'B':
- disable_batch = true;
+ use_batch_insert = true;
break;
case 'b':
- disable_batch = false;
+ use_batch_insert = false;
break;
case 'd': /* debug level */
if (*optarg == 't') {
@@ -205,10 +204,10 @@ int main (int argc, char *argv[])
btime_t start, end;
/* To use the -r option, the catalog should already contains records */
- if ((db = db_init_database(NULL, NULL, db_name, db_user, db_password,
+ if ((db = db_init_database(NULL, NULL, db_name, db_user, db_password,
db_host, 0, NULL, db_ssl_key, db_ssl_cert,
db_ssl_ca, db_ssl_capath, db_ssl_cipher,
- false, disable_batch)) == NULL) {
+ false, !use_batch_insert)) == NULL) {
Emsg0(M_ERROR_TERM, 0, _("Could not init Bacula database\n"));
}
if (!db_open_database(NULL, db)) {
@@ -226,10 +225,10 @@ int main (int argc, char *argv[])
return 0;
}
- if (disable_batch) {
- printf("Without new Batch mode\n");
- } else {
- printf("With new Batch mode\n");
+ if (use_batch_insert) {
+ printf("With Batch Insert mode\n");
+ } else {
+ printf("Without Batch Insert mode\n");
}
i = nb;
@@ -256,7 +255,7 @@ int main (int argc, char *argv[])
bjcr->fileset_md5 = get_pool_memory(PM_FNAME);
pm_strcpy(bjcr->fileset_md5, "Dummy.fileset.md5");
- if ((db = db_init_database(NULL, NULL, db_name, db_user, db_password,
+ if ((db = db_init_database(NULL, NULL, db_name, db_user, db_password,
db_host, 0, NULL, db_ssl_key, db_ssl_cert,
db_ssl_ca, db_ssl_capath, db_ssl_cipher,
false, false)) == NULL) {
diff --git a/src/tools/bpluginfo.c b/src/tools/bpluginfo.c
index 15318f1..36fe0ff 100644
--- a/src/tools/bpluginfo.c
+++ b/src/tools/bpluginfo.c
@@ -10,19 +10,22 @@
* - Enabled functions, etc.
*/
/*
- Bacula® - The Network Backup Solution
+ Bacula(R) - The Network Backup Solution
- Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2012-2016 Kern Sibbald
- The main author of Bacula is Kern Sibbald, with contributions from many
- others, a complete list can be found in the file AUTHORS.
+ The original author of Bacula is Kern Sibbald, with contributions
+ from many others, a complete list can be found in the file AUTHORS.
You may use this file and others of this release according to the
license defined in the LICENSE file, which includes the Affero General
Public License, v3.0 ("AGPLv3") and some additional permissions and
terms pursuant to its AGPLv3 Section 7.
- Bacula® is a registered trademark of Kern Sibbald.
+ This notice must be preserved when any source code is
+ conveyed and/or propagated.
+
+ Bacula(R) is a registered trademark of Kern Sibbald.
*/
#ifdef working /* currently will not compile KES 21 Nov 2015 */
diff --git a/src/tools/bregex.c b/src/tools/bregex.c
index 0b08934..fe51eac 100644
--- a/src/tools/bregex.c
+++ b/src/tools/bregex.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/tools/bregtest.c b/src/tools/bregtest.c
index d28f0bc..b6d5945 100644
--- a/src/tools/bregtest.c
+++ b/src/tools/bregtest.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/tools/bsnapshot.c b/src/tools/bsnapshot.c
index 6d6b85b..68495db 100644
--- a/src/tools/bsnapshot.c
+++ b/src/tools/bsnapshot.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2011-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/tools/bvfs_test.c b/src/tools/bvfs_test.c
index 3ac3253..6037faa 100644
--- a/src/tools/bvfs_test.c
+++ b/src/tools/bvfs_test.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2009-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -221,7 +220,7 @@ int main (int argc, char *argv[])
pm_strcpy(bjcr->client_name, "Dummy.Client.Name");
bstrncpy(bjcr->Job, "bvfs_test", sizeof(bjcr->Job));
- if ((db = db_init_database(NULL, NULL, db_name, db_user, db_password,
+ if ((db = db_init_database(NULL, NULL, db_name, db_user, db_password,
db_host, 0, NULL,
db_ssl_key, db_ssl_cert, db_ssl_ca,
db_ssl_capath, db_ssl_cipher,
diff --git a/src/tools/bwild.c b/src/tools/bwild.c
index e523d3f..66b872d 100644
--- a/src/tools/bwild.c
+++ b/src/tools/bwild.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/tools/cats_test.c b/src/tools/cats_test.c
index c51f21f..75adc4d 100644
--- a/src/tools/cats_test.c
+++ b/src/tools/cats_test.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2011-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
@@ -325,8 +324,8 @@ int main (int argc, char *argv[])
*/
jcr = new_jcr(sizeof(JCR), NULL);
- jcr->setJobType(JT_CONSOLE);
- jcr->setJobLevel(L_NONE);
+ jcr->setJobType(JT_CONSOLE);
+ jcr->setJobLevel(L_NONE);
jcr->JobStatus = JS_Running;
bstrncpy(jcr->Job, "**dummy**", sizeof(jcr->Job));
jcr->JobId = pid; /* this is JobId on tape */
diff --git a/src/tools/drivetype.c b/src/tools/drivetype.c
index f62f3f0..7d421c4 100644
--- a/src/tools/drivetype.c
+++ b/src/tools/drivetype.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/tools/fstype.c b/src/tools/fstype.c
index 150afe6..d61e0f2 100644
--- a/src/tools/fstype.c
+++ b/src/tools/fstype.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/tools/testfind.c b/src/tools/testfind.c
index bcd67a5..8b4537e 100644
--- a/src/tools/testfind.c
+++ b/src/tools/testfind.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/tools/testls.c b/src/tools/testls.c
index 65fa99a..bfcab4c 100644
--- a/src/tools/testls.c
+++ b/src/tools/testls.c
@@ -1,8 +1,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
diff --git a/src/version.h b/src/version.h
index 229e2fb..60df9e0 100644
--- a/src/version.h
+++ b/src/version.h
@@ -5,14 +5,14 @@
#define COMMUNITY 1 /* Define to create a Windows community binary */
/* Note: there can be only *one* VERSION in this file */
-#define VERSION "7.2.1"
-#define BDATE "23 December 2015"
-#define LSMDATE "23Dec15"
+#define VERSION "7.4.0"
+#define BDATE "10 January 2016"
+#define LSMDATE "10Jan16"
#define RELEASE 1 /* Use ONLY in rpms */
-#define PROG_COPYRIGHT "Copyright (C) %d-2015 Kern Sibbald.\n"
-#define BYEAR "2015" /* year for copyright messages in progs */
+#define PROG_COPYRIGHT "Copyright (C) %d-2016 Kern Sibbald.\n"
+#define BYEAR "2016" /* year for copyright messages in progs */
/*
* Versions of packages needed to build Bacula components
@@ -23,8 +23,7 @@
/*
Bacula(R) - The Network Backup Solution
- Copyright (C) 2000-2015 Kern Sibbald
- Copyright (C) 2000-2015 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 Kern Sibbald
The original author of Bacula is Kern Sibbald, with contributions
from many others, a complete list can be found in the file AUTHORS.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git
More information about the pkg-bacula-commits
mailing list