diff options
author | Carsten Leonhardt <leo@debian.org> | 2017-08-14 21:23:44 +0200 |
---|---|---|
committer | Carsten Leonhardt <leo@debian.org> | 2017-08-14 21:23:44 +0200 |
commit | de24c5ed869d63722e808d1a2015e95cd6780664 (patch) | |
tree | a9076a1594e38af69a8547b617c2b9ea5438e1ef | |
parent | cd590d4094bf742c60aea3afff67f0d3a5422eee (diff) |
Imported Upstream version 9.0.2+dfsg
-rw-r--r-- | ChangeLog | 30 | ||||
-rw-r--r-- | ReleaseNotes | 39 | ||||
-rw-r--r-- | autoconf/config.h.in | 9 | ||||
-rw-r--r-- | autoconf/configure.in | 1 | ||||
-rwxr-xr-x | configure | 21 | ||||
-rw-r--r-- | po/bacula.pot | 338 | ||||
-rw-r--r-- | po/de.po | 338 | ||||
-rw-r--r-- | po/es.po | 346 | ||||
-rw-r--r-- | po/fr.po | 338 | ||||
-rw-r--r-- | po/nl.po | 338 | ||||
-rw-r--r-- | po/sv.po | 338 | ||||
-rw-r--r-- | po/uk.po | 338 | ||||
-rwxr-xr-x | scripts/Makefile.in | 1 | ||||
-rw-r--r-- | src/cats/mysql.c | 3 | ||||
-rw-r--r-- | src/cats/postgresql.c | 27 | ||||
-rw-r--r-- | src/dird/bdirjson.c | 1 | ||||
-rw-r--r-- | src/dird/ua_label.c | 27 | ||||
-rw-r--r-- | src/filed/backup.c | 16 | ||||
-rw-r--r-- | src/filed/backup.h | 19 | ||||
-rw-r--r-- | src/stored/btape.c | 17 | ||||
-rw-r--r-- | src/stored/tape_dev.c | 3 | ||||
-rw-r--r-- | src/version.h | 6 |
22 files changed, 1353 insertions, 1241 deletions
@@ -1,4 +1,31 @@ - Changelog on version 9.0.1 + Changelog on version 9.0.2 + +Release 9.0.2 + +23Jul17 + - Use Bacula in place of Libz variables so we can build with/without libz and + lzo + - Apply ideas from bug #2255 prettier status slots output + - Configure and install bacula-tray-monitor.desktop + +22Jul17 + - Fix btape test which counted files incorrectly on EOT + +21Jul17 + - Fix bug #2296 where Bacula would not compile with postgres 8 or older + +20Jul17 + - Fix bug #2294 Bacula does not build with MariaDB 10.2 + +14Jul17 + - baculum: Fix multiple directors support + - baculum: Fix showing errors from the API + +Bugs fixed/closed since last release: +2255 2294 2296 + + +Release 9.0.1 10Jul17 - Remove two incorrect trailing commas in bsock.h @@ -14,6 +41,7 @@ Bugs fixed/closed since last release: 2293 +Release 9.0.0 02Jul17 - Skip verify-data-test if not running Linux diff --git a/ReleaseNotes b/ReleaseNotes index 2fffb1b0..669f098b 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -1,5 +1,42 @@ - Release Notes for Bacula 9.0.1 + Release Notes for Bacula 9.0.2 + +This is a minor bug fix release, but a few of the bugs are important. +The main items fixed are: + +- Postgresql should now work with Postgresql prior to 9.0 + Note: the ssl connection feature added in 9.0 is not available on + postgresql servers older than 9.0 (it needs the new connection API). +- The issues with MariaDB (reconnect variable) are now fixed +- The problem of the btape "test" command finding a wrong number + of files in the append test was a bug. It is now fixed. It is + unlikely that it affected anything but btape. +- The bacula-tray-monitor.deskop script is released in the scripts + directory. +- We recommend that you build with libz and lzo library support (the + developer packages must be installed when building, and the shared + object libraries must be installed at run time). However we have + modified the code so that Bacula *should* build and run with either + or both libz or lzo absent. + +23Jul17 + - Use Bacula in place of Libz variables so we can build with/without + libz and lzo + - Apply ideas from bug #2255 prettier status slots output + - Configure and install bacula-tray-monitor.desktop + - Fix btape test which counted files incorrectly on EOT + - Fix bug #2296 where Bacula would not compile with postgres 8 or older + - Fix bug #2294 Bacula does not build with MariaDB 10.2 + - baculum: Fix multiple directors support + - baculum: Fix showing errors from the API + +Bugs fixed/closed since last release: +2255 2294 2296 + + +================================================================== + +Release 9.0.1 12Jul17: This is a minor bug fix release that mainly to include the new tray-monitor files that were omitted. The tray-monitor now builds diff --git a/autoconf/config.h.in b/autoconf/config.h.in index d1a72502..60cbb30e 100644 --- a/autoconf/config.h.in +++ b/autoconf/config.h.in @@ -113,6 +113,9 @@ /* Define if you have zlib */ #undef HAVE_LIBZ +/* Define if you have lzo lib */ +#undef HAVE_LZO + /* Define if you have libacl */ #undef HAVE_ACL @@ -1133,9 +1136,9 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ diff --git a/autoconf/configure.in b/autoconf/configure.in index 406e5b14..00d30a41 100644 --- a/autoconf/configure.in +++ b/autoconf/configure.in @@ -3398,6 +3398,7 @@ AC_OUTPUT([autoconf/Make.common \ scripts/bat.desktop.xsu \ scripts/bat.desktop.consolehelper \ scripts/bat.console_apps \ + scripts/bacula-tray-monitor.desktop \ src/Makefile \ src/host.h \ src/console/Makefile \ @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for bacula 9.0.0. +# Generated by GNU Autoconf 2.69 for bacula 9.0.2. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='bacula' PACKAGE_TARNAME='bacula' -PACKAGE_VERSION='9.0.0' -PACKAGE_STRING='bacula 9.0.0' +PACKAGE_VERSION='9.0.2' +PACKAGE_STRING='bacula 9.0.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1584,7 +1584,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures bacula 9.0.0 to adapt to many kinds of systems. +\`configure' configures bacula 9.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1654,7 +1654,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bacula 9.0.0:";; + short | recursive ) echo "Configuration of bacula 9.0.2:";; esac cat <<\_ACEOF @@ -1853,7 +1853,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bacula configure 9.0.0 +bacula configure 9.0.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2788,7 +2788,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bacula $as_me 9.0.0, which was +It was created by bacula $as_me 9.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -31192,7 +31192,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then fi -ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/btraceback scripts/bconsole scripts/baculabackupreport scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/bat.pro.mingw64 src/qt-console/install_conf_file src/qt-console/tray-monitor/tray-monitor.conf src/qt-console/tray-monitor/tray-monitor.pro src/qt-console/tray-monitor/tray-monitor.pro.mingw32 src/qt-console/tray-monitor/tray-monitor.pro.mingw64 src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/cats/install-default-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables updatedb/update_sqlite3_tables updatedb/update_postgresql_tables updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec platforms/rpms/suse/bacula-mtx.spec $PFILES" +ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/btraceback scripts/bconsole scripts/baculabackupreport scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps scripts/bacula-tray-monitor.desktop src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/bat.pro.mingw64 src/qt-console/install_conf_file src/qt-console/tray-monitor/tray-monitor.conf src/qt-console/tray-monitor/tray-monitor.pro src/qt-console/tray-monitor/tray-monitor.pro.mingw32 src/qt-console/tray-monitor/tray-monitor.pro.mingw64 src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/cats/install-default-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables updatedb/update_sqlite3_tables updatedb/update_postgresql_tables updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec platforms/rpms/suse/bacula-mtx.spec $PFILES" ac_config_commands="$ac_config_commands default" @@ -31703,7 +31703,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by bacula $as_me 9.0.0, which was +This file was extended by bacula $as_me 9.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31769,7 +31769,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -bacula config.status 9.0.0 +bacula config.status 9.0.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -32304,6 +32304,7 @@ do "scripts/bat.desktop.xsu") CONFIG_FILES="$CONFIG_FILES scripts/bat.desktop.xsu" ;; "scripts/bat.desktop.consolehelper") CONFIG_FILES="$CONFIG_FILES scripts/bat.desktop.consolehelper" ;; "scripts/bat.console_apps") CONFIG_FILES="$CONFIG_FILES scripts/bat.console_apps" ;; + "scripts/bacula-tray-monitor.desktop") CONFIG_FILES="$CONFIG_FILES scripts/bacula-tray-monitor.desktop" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/host.h") CONFIG_FILES="$CONFIG_FILES src/host.h" ;; "src/console/Makefile") CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;; diff --git a/po/bacula.pot b/po/bacula.pot index c8e7619e..7b73b478 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-06-30 08:32+0200\n" +"POT-Creation-Date: 2017-07-23 18:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -39,8 +39,8 @@ msgstr "" msgid "*None*" msgstr "" -#: src/cats/cats.c:137 src/cats/mysql.c:487 src/cats/postgresql.c:583 -#: src/cats/postgresql.c:634 src/cats/sqlite.c:488 +#: src/cats/cats.c:137 src/cats/mysql.c:488 src/cats/postgresql.c:606 +#: src/cats/postgresql.c:657 src/cats/sqlite.c:488 #, c-format msgid "Query failed: %s: ERR=%s\n" msgstr "" @@ -53,12 +53,12 @@ msgstr "" msgid "A user name for MySQL must be supplied.\n" msgstr "" -#: src/cats/mysql.c:210 src/cats/postgresql.c:247 src/cats/sqlite.c:184 +#: src/cats/mysql.c:211 src/cats/postgresql.c:256 src/cats/sqlite.c:184 #, c-format msgid "Unable to initialize DB lock. ERR=%s\n" msgstr "" -#: src/cats/mysql.c:267 +#: src/cats/mysql.c:268 #, c-format msgid "" "Unable to connect to MySQL server.\n" @@ -67,17 +67,17 @@ msgid "" "incorrect.\n" msgstr "" -#: src/cats/mysql.c:463 src/cats/postgresql.c:529 src/cats/sqlite.c:411 +#: src/cats/mysql.c:464 src/cats/postgresql.c:552 src/cats/sqlite.c:411 #: src/dird/fd_cmds.c:960 src/dird/fd_cmds.c:1021 #, c-format msgid "Attribute create error. %s" msgstr "" -#: src/cats/postgresql.c:110 +#: src/cats/postgresql.c:119 msgid "A user name for PostgreSQL must be supplied.\n" msgstr "" -#: src/cats/postgresql.c:205 src/cats/sql.c:531 src/cats/sql.c:538 +#: src/cats/postgresql.c:214 src/cats/sql.c:531 src/cats/sql.c:538 #: src/cats/sql_create.c:559 src/cats/sql_get.c:191 src/cats/sql_get.c:242 #: src/cats/sql_get.c:613 src/cats/sql_get.c:824 src/cats/sql_get.c:1152 #: src/cats/sql_get.c:1543 src/cats/sql_get.c:1695 @@ -85,12 +85,12 @@ msgstr "" msgid "error fetching row: %s\n" msgstr "" -#: src/cats/postgresql.c:217 +#: src/cats/postgresql.c:226 #, c-format msgid "Encoding error for database \"%s\". Wanted SQL_ASCII, got %s\n" msgstr "" -#: src/cats/postgresql.c:307 +#: src/cats/postgresql.c:330 #, c-format msgid "" "Unable to connect to PostgreSQL server. Database=%s User=%s\n" @@ -98,39 +98,39 @@ msgid "" "exceeded.\n" msgstr "" -#: src/cats/postgresql.c:423 +#: src/cats/postgresql.c:446 msgid "PQescapeStringConn returned non-zero.\n" msgstr "" -#: src/cats/postgresql.c:443 +#: src/cats/postgresql.c:466 msgid "PQescapeByteaConn returned NULL.\n" msgstr "" -#: src/cats/postgresql.c:472 +#: src/cats/postgresql.c:495 msgid "PQunescapeByteaConn returned NULL.\n" msgstr "" -#: src/cats/postgresql.c:590 +#: src/cats/postgresql.c:613 #, c-format msgid "Fetch failed: ERR=%s\n" msgstr "" -#: src/cats/postgresql.c:883 +#: src/cats/postgresql.c:906 #, c-format msgid "error fetching currval: %s\n" msgstr "" -#: src/cats/postgresql.c:1064 +#: src/cats/postgresql.c:1087 #, c-format msgid "error starting batch mode: %s" msgstr "" -#: src/cats/postgresql.c:1094 src/cats/postgresql.c:1101 +#: src/cats/postgresql.c:1117 src/cats/postgresql.c:1124 #, c-format msgid "error ending batch mode: %s" msgstr "" -#: src/cats/postgresql.c:1151 +#: src/cats/postgresql.c:1174 #, c-format msgid "error copying in batch mode: %s" msgstr "" @@ -718,7 +718,7 @@ msgstr "" #: src/console/bbconsjson.c:432 src/console/bbconsjson.c:463 #: src/console/console.c:1422 src/console/console.c:1452 -#: src/dird/bdirjson.c:1184 src/dird/bdirjson.c:1222 src/dird/bdirjson.c:1277 +#: src/dird/bdirjson.c:1185 src/dird/bdirjson.c:1223 src/dird/bdirjson.c:1278 #: src/dird/dird.c:778 src/dird/dird.c:996 src/dird/dird.c:1051 #: src/dird/dird.c:1254 src/filed/bfdjson.c:484 src/filed/bfdjson.c:527 #: src/filed/bfdjson.c:562 src/filed/filed.c:390 src/filed/filed.c:590 @@ -1317,37 +1317,37 @@ msgid "" "\n" msgstr "" -#: src/dird/bdirjson.c:1162 src/dird/dird.c:756 +#: src/dird/bdirjson.c:1163 src/dird/dird.c:756 #, c-format msgid "" "No Director resource defined in %s\n" "Without that I don't know who I am :-(\n" msgstr "" -#: src/dird/bdirjson.c:1170 src/dird/dird.c:764 src/filed/bfdjson.c:477 +#: src/dird/bdirjson.c:1171 src/dird/dird.c:764 src/filed/bfdjson.c:477 #: src/filed/filed.c:352 #, c-format msgid "No Messages resource defined in %s\n" msgstr "" -#: src/dird/bdirjson.c:1175 src/dird/dird.c:769 +#: src/dird/bdirjson.c:1176 src/dird/dird.c:769 #, c-format msgid "Only one Director resource permitted in %s\n" msgstr "" -#: src/dird/bdirjson.c:1192 src/dird/dird.c:786 src/filed/bfdjson.c:537 +#: src/dird/bdirjson.c:1193 src/dird/dird.c:786 src/filed/bfdjson.c:537 #: src/filed/filed.c:600 src/stored/bsdjson.c:607 src/stored/stored.c:447 #, c-format msgid "\"TLS Certificate\" file not defined for Director \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1198 src/dird/dird.c:792 src/filed/bfdjson.c:543 +#: src/dird/bdirjson.c:1199 src/dird/dird.c:792 src/filed/bfdjson.c:543 #: src/filed/filed.c:606 src/stored/bsdjson.c:613 src/stored/stored.c:453 #, c-format msgid "\"TLS Key\" file not defined for Director \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1205 src/dird/dird.c:799 src/filed/bfdjson.c:549 +#: src/dird/bdirjson.c:1206 src/dird/dird.c:799 src/filed/bfdjson.c:549 #: src/filed/filed.c:612 src/stored/bsdjson.c:619 src/stored/stored.c:459 #, c-format msgid "" @@ -1356,19 +1356,19 @@ msgid "" "using \"TLS Verify Peer\".\n" msgstr "" -#: src/dird/bdirjson.c:1231 src/dird/dird.c:1005 src/filed/bfdjson.c:572 +#: src/dird/bdirjson.c:1232 src/dird/dird.c:1005 src/filed/bfdjson.c:572 #: src/filed/filed.c:653 #, c-format msgid "\"TLS Certificate\" file not defined for Console \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1237 src/dird/dird.c:1011 src/filed/bfdjson.c:578 +#: src/dird/bdirjson.c:1238 src/dird/dird.c:1011 src/filed/bfdjson.c:578 #: src/filed/filed.c:659 #, c-format msgid "\"TLS Key\" file not defined for Console \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1244 src/dird/dird.c:1018 src/filed/bfdjson.c:584 +#: src/dird/bdirjson.c:1245 src/dird/dird.c:1018 src/filed/bfdjson.c:584 #: src/filed/filed.c:665 #, c-format msgid "" @@ -1377,40 +1377,40 @@ msgid "" "using \"TLS Verify Peer\".\n" msgstr "" -#: src/dird/bdirjson.c:1261 src/dird/dird.c:1035 src/dird/dird.c:1075 +#: src/dird/bdirjson.c:1262 src/dird/dird.c:1035 src/dird/dird.c:1075 #: src/filed/filed.c:415 #, c-format msgid "Failed to initialize TLS context for File daemon \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1284 src/dird/dird.c:1058 +#: src/dird/bdirjson.c:1285 src/dird/dird.c:1058 #, c-format msgid "" "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for " "File daemon \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1293 src/dird/dird.c:826 +#: src/dird/bdirjson.c:1294 src/dird/dird.c:826 #, c-format msgid "No Job records defined in %s\n" msgstr "" -#: src/dird/bdirjson.c:1353 src/dird/bdirjson.c:1366 src/dird/dird.c:877 +#: src/dird/bdirjson.c:1354 src/dird/bdirjson.c:1367 src/dird/dird.c:877 #: src/dird/dird.c:890 #, c-format msgid "Hey something is wrong. p=0x%lu\n" msgstr "" -#: src/dird/bdirjson.c:1452 src/dird/dird.c:960 +#: src/dird/bdirjson.c:1453 src/dird/dird.c:960 #, c-format msgid "\"%s\" directive in Job \"%s\" resource is required, but not found.\n" msgstr "" -#: src/dird/bdirjson.c:1459 src/dird/dird.c:967 +#: src/dird/bdirjson.c:1460 src/dird/dird.c:967 msgid "Too many items in Job resource\n" msgstr "" -#: src/dird/bdirjson.c:1463 src/dird/dird.c:971 +#: src/dird/bdirjson.c:1464 src/dird/dird.c:971 #, c-format msgid "No storage specified in Job \"%s\" nor in Pool.\n" msgstr "" @@ -3844,11 +3844,11 @@ msgstr "" msgid "Enter base volume name: " msgstr "" -#: src/dird/ua_cmds.c:368 src/dird/ua_label.c:652 +#: src/dird/ua_cmds.c:368 src/dird/ua_label.c:654 msgid "Volume name too long.\n" msgstr "" -#: src/dird/ua_cmds.c:372 src/dird/ua_label.c:658 src/lib/edit.c:519 +#: src/dird/ua_cmds.c:372 src/dird/ua_label.c:660 src/lib/edit.c:519 msgid "Volume name must be at least one character long.\n" msgstr "" @@ -4446,12 +4446,12 @@ msgstr "" msgid "Slot too large.\n" msgstr "" -#: src/dird/ua_label.c:178 src/dird/ua_label.c:356 src/dird/ua_label.c:1185 +#: src/dird/ua_label.c:178 src/dird/ua_label.c:356 src/dird/ua_label.c:1190 #: src/dird/ua_run.c:473 src/dird/ua_run.c:1356 src/dird/ua_run.c:1361 msgid "Command input" msgstr "" -#: src/dird/ua_label.c:196 src/dird/ua_label.c:520 src/dird/ua_label.c:1192 +#: src/dird/ua_label.c:196 src/dird/ua_label.c:520 src/dird/ua_label.c:1197 msgid "No slots in changer to scan.\n" msgstr "" @@ -4459,7 +4459,7 @@ msgstr "" msgid "No Volumes found to label, or no barcodes.\n" msgstr "" -#: src/dird/ua_label.c:218 src/dird/ua_label.c:1213 +#: src/dird/ua_label.c:218 src/dird/ua_label.c:1219 #, c-format msgid "Slot %d greater than max %d ignored.\n" msgstr "" @@ -4559,69 +4559,69 @@ msgstr "" msgid "Catalog error on cleaning tape: %s" msgstr "" -#: src/dird/ua_label.c:645 +#: src/dird/ua_label.c:647 #, c-format msgid "Illegal character \"%c\" in a volume name.\n" msgstr "" -#: src/dird/ua_label.c:693 +#: src/dird/ua_label.c:695 #, c-format msgid "Sending relabel command from \"%s\" to \"%s\" ...\n" msgstr "" -#: src/dird/ua_label.c:700 +#: src/dird/ua_label.c:702 #, c-format msgid "Sending label command for Volume \"%s\" Slot %d ...\n" msgstr "" -#: src/dird/ua_label.c:730 +#: src/dird/ua_label.c:732 #, c-format msgid "Catalog record for Volume \"%s\", Slot %d successfully created.\n" msgstr "" -#: src/dird/ua_label.c:745 +#: src/dird/ua_label.c:747 #, c-format msgid "Label command failed for Volume %s.\n" msgstr "" -#: src/dird/ua_label.c:759 +#: src/dird/ua_label.c:761 msgid "Could not open SD socket.\n" msgstr "" -#: src/dird/ua_label.c:831 src/dird/ua_label.c:841 +#: src/dird/ua_label.c:833 src/dird/ua_label.c:843 #, c-format msgid "Invalid Slot number: %s\n" msgstr "" -#: src/dird/ua_label.c:850 +#: src/dird/ua_label.c:852 #, c-format msgid "Invalid Volume name: %s. Volume skipped.\n" msgstr "" -#: src/dird/ua_label.c:944 +#: src/dird/ua_label.c:946 #, c-format msgid "Device \"%s\" has %d slots.\n" msgstr "" -#: src/dird/ua_label.c:990 +#: src/dird/ua_label.c:995 #, c-format msgid "Pool \"%s\" resource not found for volume \"%s\"!\n" msgstr "" -#: src/dird/ua_label.c:1204 +#: src/dird/ua_label.c:1209 msgid "No Volumes found, or no barcodes.\n" msgstr "" -#: src/dird/ua_label.c:1207 +#: src/dird/ua_label.c:1212 src/dird/ua_label.c:1214 src/dird/ua_label.c:1247 msgid "" -" Slot | Volume Name | Status | Media Type | " -"Pool |\n" +"+------+----------------------+-----------+-----------------" +"+--------------------+\n" msgstr "" -#: src/dird/ua_label.c:1208 +#: src/dird/ua_label.c:1213 msgid "" -"------+------------------+-----------+----------------------" -"+--------------------|\n" +"| Slot | Volume Name | Status | Media Type | " +"Pool |\n" msgstr "" #: src/dird/ua_output.c:57 src/dird/ua_output.c:81 @@ -6930,7 +6930,7 @@ msgstr "" msgid "%d total files; %d marked to be restored; %s bytes.\n" msgstr "" -#: src/dird/ua_tree.c:796 src/stored/btape.c:2961 +#: src/dird/ua_tree.c:796 src/stored/btape.c:2960 #, c-format msgid "" " Command Description\n" @@ -7896,27 +7896,27 @@ msgstr "" msgid "Compression deflateParams error: %d\n" msgstr "" -#: src/filed/backup.c:1105 +#: src/filed/backup.c:1103 #, c-format msgid " Cannot open resource fork for \"%s\": ERR=%s.\n" msgstr "" -#: src/filed/backup.c:1163 +#: src/filed/backup.c:1161 #, c-format msgid "Compression deflate error: %d\n" msgstr "" -#: src/filed/backup.c:1170 +#: src/filed/backup.c:1168 #, c-format msgid "Compression deflateReset error: %d\n" msgstr "" -#: src/filed/backup.c:1212 +#: src/filed/backup.c:1210 #, c-format msgid "Compression LZO error: %d\n" msgstr "" -#: src/filed/backup.c:1422 +#: src/filed/backup.c:1420 #, c-format msgid "VSS Writer (BackupComplete): %s\n" msgstr "" @@ -12425,7 +12425,7 @@ msgstr "" msgid "NULL Volume name. This shouldn't happen!!!\n" msgstr "" -#: src/stored/append.c:123 src/stored/btape.c:2240 +#: src/stored/append.c:123 src/stored/btape.c:2239 #, c-format msgid "Write session label failed. ERR=%s\n" msgstr "" @@ -12465,7 +12465,7 @@ msgstr "" msgid "Set ok=FALSE after write_block_to_device.\n" msgstr "" -#: src/stored/append.c:319 src/stored/btape.c:2359 +#: src/stored/append.c:319 src/stored/btape.c:2358 #, c-format msgid "Error writing end session label. ERR=%s\n" msgstr "" @@ -12484,7 +12484,7 @@ msgstr "" msgid "Error updating file attributes. ERR=%s\n" msgstr "" -#: src/stored/askdir.c:160 src/stored/btape.c:3045 +#: src/stored/askdir.c:160 src/stored/btape.c:3044 #, c-format msgid "Mount Volume \"%s\" on device %s and press return when ready: " msgstr "" @@ -12794,7 +12794,7 @@ msgid "Copy skipped. Record does not match BSR filter.\n" msgstr "" #: src/stored/bcopy.c:270 src/stored/bcopy.c:278 src/stored/bcopy.c:306 -#: src/stored/btape.c:2768 +#: src/stored/btape.c:2767 #, c-format msgid "Cannot fixup device error. %s\n" msgstr "" @@ -13847,7 +13847,7 @@ msgstr "" msgid "Do you want to continue? (y/n): " msgstr "" -#: src/stored/btape.c:751 src/stored/btape.c:2203 +#: src/stored/btape.c:751 src/stored/btape.c:2202 msgid "Command aborted.\n" msgstr "" @@ -13876,13 +13876,13 @@ msgstr "" #: src/stored/btape.c:813 src/stored/btape.c:824 src/stored/btape.c:835 #: src/stored/btape.c:1153 src/stored/btape.c:1169 src/stored/btape.c:1910 -#: src/stored/btape.c:2835 +#: src/stored/btape.c:2834 msgid "Error writing record to block.\n" msgstr "" #: src/stored/btape.c:817 src/stored/btape.c:828 src/stored/btape.c:839 #: src/stored/btape.c:1157 src/stored/btape.c:1173 src/stored/btape.c:1914 -#: src/stored/btape.c:2839 +#: src/stored/btape.c:2838 msgid "Error writing block to device.\n" msgstr "" @@ -13957,7 +13957,7 @@ msgstr "" msgid "Begin writing %i files of %sB with raw blocks of %u bytes.\n" msgstr "" -#: src/stored/btape.c:931 src/stored/btape.c:2891 +#: src/stored/btape.c:931 src/stored/btape.c:2890 #, c-format msgid "Write failed at block %u. stat=%d ERR=%s\n" msgstr "" @@ -14508,7 +14508,7 @@ msgstr "" msgid "Read of %d bytes gives stat=%d. ERR=%s\n" msgstr "" -#: src/stored/btape.c:1970 src/stored/btape.c:2019 +#: src/stored/btape.c:1970 src/stored/btape.c:2018 #, c-format msgid "End of tape\n" msgstr "" @@ -14528,51 +14528,51 @@ msgstr "" msgid "Bad status from read %d. ERR=%s\n" msgstr "" -#: src/stored/btape.c:1985 src/stored/btape.c:1999 src/stored/btape.c:2063 -#: src/stored/btape.c:2075 src/stored/btape.c:2088 src/stored/btape.c:2104 +#: src/stored/btape.c:1985 src/stored/btape.c:1999 src/stored/btape.c:2062 +#: src/stored/btape.c:2074 src/stored/btape.c:2087 src/stored/btape.c:2103 #, c-format msgid "1 block of %d bytes in file %d\n" msgstr "" -#: src/stored/btape.c:1988 src/stored/btape.c:2002 src/stored/btape.c:2066 -#: src/stored/btape.c:2078 src/stored/btape.c:2091 src/stored/btape.c:2107 +#: src/stored/btape.c:1988 src/stored/btape.c:2002 src/stored/btape.c:2065 +#: src/stored/btape.c:2077 src/stored/btape.c:2090 src/stored/btape.c:2106 #, c-format msgid "%d blocks of %d bytes in file %d\n" msgstr "" -#: src/stored/btape.c:2010 src/stored/btape.c:2082 +#: src/stored/btape.c:2010 src/stored/btape.c:2081 #, c-format msgid "End of File mark.\n" msgstr "" -#: src/stored/btape.c:2031 src/stored/btape.c:2135 +#: src/stored/btape.c:2030 src/stored/btape.c:2134 #, c-format msgid "Total files=%d, blocks=%d, bytes = %s\n" msgstr "" -#: src/stored/btape.c:2095 +#: src/stored/btape.c:2094 #, c-format msgid "Short block read.\n" msgstr "" -#: src/stored/btape.c:2098 +#: src/stored/btape.c:2097 #, c-format msgid "Error reading block. ERR=%s\n" msgstr "" -#: src/stored/btape.c:2122 +#: src/stored/btape.c:2121 #, c-format msgid "" "Block=%u file,blk=%u,%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s " "rlen=%d\n" msgstr "" -#: src/stored/btape.c:2144 +#: src/stored/btape.c:2143 #, c-format msgid "Device status: %u. ERR=%s\n" msgstr "" -#: src/stored/btape.c:2176 +#: src/stored/btape.c:2175 #, c-format msgid "" "\n" @@ -14598,79 +14598,79 @@ msgid "" "\n" msgstr "" -#: src/stored/btape.c:2194 +#: src/stored/btape.c:2193 msgid "" "Do you want to run the simplified test (s) with one tape\n" "or the complete multiple tape (m) test: (s/m) " msgstr "" -#: src/stored/btape.c:2197 +#: src/stored/btape.c:2196 msgid "Simple test (single tape) selected.\n" msgstr "" -#: src/stored/btape.c:2200 +#: src/stored/btape.c:2199 msgid "Multiple tape test selected.\n" msgstr "" -#: src/stored/btape.c:2244 +#: src/stored/btape.c:2243 msgid "Wrote Start of Session label.\n" msgstr "" -#: src/stored/btape.c:2263 +#: src/stored/btape.c:2262 #, c-format msgid "%s Begin writing Bacula records to tape ...\n" msgstr "" -#: src/stored/btape.c:2265 +#: src/stored/btape.c:2264 #, c-format msgid "%s Begin writing Bacula records to first tape ...\n" msgstr "" -#: src/stored/btape.c:2291 +#: src/stored/btape.c:2290 msgid "Flush block failed.\n" msgstr "" -#: src/stored/btape.c:2305 +#: src/stored/btape.c:2304 #, c-format msgid "Wrote block=%u, file,blk=%u,%u VolBytes=%s rate=%sB/s\n" msgstr "" -#: src/stored/btape.c:2316 +#: src/stored/btape.c:2315 #, c-format msgid "%s Flush block, write EOF\n" msgstr "" -#: src/stored/btape.c:2325 +#: src/stored/btape.c:2324 msgid "Wrote 1000 blocks on second tape. Done.\n" msgstr "" -#: src/stored/btape.c:2330 +#: src/stored/btape.c:2329 msgid "Not OK\n" msgstr "" -#: src/stored/btape.c:2354 +#: src/stored/btape.c:2353 msgid "Job canceled.\n" msgstr "" -#: src/stored/btape.c:2365 +#: src/stored/btape.c:2364 msgid "Set ok=false after write_block_to_device.\n" msgstr "" -#: src/stored/btape.c:2369 +#: src/stored/btape.c:2368 msgid "Wrote End of Session label.\n" msgstr "" -#: src/stored/btape.c:2392 +#: src/stored/btape.c:2391 #, c-format msgid "Wrote state file last_block_num1=%d last_block_num2=%d\n" msgstr "" -#: src/stored/btape.c:2396 +#: src/stored/btape.c:2395 #, c-format msgid "Could not create state file: %s ERR=%s\n" msgstr "" -#: src/stored/btape.c:2407 +#: src/stored/btape.c:2406 #, c-format msgid "" "\n" @@ -14678,7 +14678,7 @@ msgid "" "%s Done filling tape at %d:%d. Now beginning re-read of tape ...\n" msgstr "" -#: src/stored/btape.c:2410 +#: src/stored/btape.c:2409 #, c-format msgid "" "\n" @@ -14686,23 +14686,23 @@ msgid "" "%s Done filling tapes at %d:%d. Now beginning re-read of first tape ...\n" msgstr "" -#: src/stored/btape.c:2416 +#: src/stored/btape.c:2415 msgid "do_unfill failed.\n" msgstr "" -#: src/stored/btape.c:2421 +#: src/stored/btape.c:2420 #, c-format msgid "%s: Error during test.\n" msgstr "" -#: src/stored/btape.c:2456 +#: src/stored/btape.c:2455 msgid "" "\n" "The state file level has changed. You must redo\n" "the fill command.\n" msgstr "" -#: src/stored/btape.c:2463 +#: src/stored/btape.c:2462 #, c-format msgid "" "\n" @@ -14710,95 +14710,95 @@ msgid "" "You must redo the fill command.\n" msgstr "" -#: src/stored/btape.c:2529 +#: src/stored/btape.c:2528 msgid "Mount first tape. Press enter when ready: " msgstr "" -#: src/stored/btape.c:2546 +#: src/stored/btape.c:2545 msgid "Rewinding.\n" msgstr "" -#: src/stored/btape.c:2551 +#: src/stored/btape.c:2550 #, c-format msgid "Reading the first 10000 records from %u:%u.\n" msgstr "" -#: src/stored/btape.c:2555 src/stored/btape.c:2627 +#: src/stored/btape.c:2554 src/stored/btape.c:2626 #, c-format msgid "Reposition from %u:%u to %u:%u\n" msgstr "" -#: src/stored/btape.c:2560 src/stored/btape.c:2614 src/stored/btape.c:2632 +#: src/stored/btape.c:2559 src/stored/btape.c:2613 src/stored/btape.c:2631 #, c-format msgid "Reposition error. ERR=%s\n" msgstr "" -#: src/stored/btape.c:2563 +#: src/stored/btape.c:2562 #, c-format msgid "Reading block %u.\n" msgstr "" -#: src/stored/btape.c:2565 src/stored/btape.c:2619 src/stored/btape.c:2637 +#: src/stored/btape.c:2564 src/stored/btape.c:2618 src/stored/btape.c:2636 #, c-format msgid "Error reading block: ERR=%s\n" msgstr "" -#: src/stored/btape.c:2570 +#: src/stored/btape.c:2569 msgid "" "\n" "The last block on the tape matches. Test succeeded.\n" "\n" msgstr "" -#: src/stored/btape.c:2573 +#: src/stored/btape.c:2572 msgid "" "\n" "The last block of the first tape matches.\n" "\n" msgstr "" -#: src/stored/btape.c:2597 +#: src/stored/btape.c:2596 msgid "Mount second tape. Press enter when ready: " msgstr "" -#: src/stored/btape.c:2611 +#: src/stored/btape.c:2610 #, c-format msgid "Reposition from %u:%u to 0:1\n" msgstr "" -#: src/stored/btape.c:2617 src/stored/btape.c:2635 +#: src/stored/btape.c:2616 src/stored/btape.c:2634 #, c-format msgid "Reading block %d.\n" msgstr "" -#: src/stored/btape.c:2623 +#: src/stored/btape.c:2622 msgid "" "\n" "The first block on the second tape matches.\n" "\n" msgstr "" -#: src/stored/btape.c:2641 +#: src/stored/btape.c:2640 msgid "" "\n" "The last block on the second tape matches. Test succeeded.\n" "\n" msgstr "" -#: src/stored/btape.c:2659 +#: src/stored/btape.c:2658 #, c-format msgid "10000 records read now at %d:%d\n" msgstr "" -#: src/stored/btape.c:2685 src/stored/btape.c:2696 src/stored/btape.c:2741 +#: src/stored/btape.c:2684 src/stored/btape.c:2695 src/stored/btape.c:2740 msgid "Last block written" msgstr "" -#: src/stored/btape.c:2687 src/stored/btape.c:2697 +#: src/stored/btape.c:2686 src/stored/btape.c:2696 msgid "Block read back" msgstr "" -#: src/stored/btape.c:2688 +#: src/stored/btape.c:2687 #, c-format msgid "" "\n" @@ -14806,7 +14806,7 @@ msgid "" "The blocks differ at byte %u\n" msgstr "" -#: src/stored/btape.c:2689 +#: src/stored/btape.c:2688 msgid "" "\n" "\n" @@ -14816,172 +14816,172 @@ msgid "" "to write multi-tape Volumes.!!!!\n" msgstr "" -#: src/stored/btape.c:2725 +#: src/stored/btape.c:2724 #, c-format msgid "Last block at: %u:%u this_dev_block_num=%d\n" msgstr "" -#: src/stored/btape.c:2739 +#: src/stored/btape.c:2738 #, c-format msgid "Block not written: FileIndex=%u blk_block=%u Size=%u\n" msgstr "" -#: src/stored/btape.c:2743 +#: src/stored/btape.c:2742 msgid "Block not written" msgstr "" -#: src/stored/btape.c:2758 +#: src/stored/btape.c:2757 #, c-format msgid "End of tape %d:%d. Volume Bytes=%s. Write rate = %sB/s\n" msgstr "" -#: src/stored/btape.c:2809 +#: src/stored/btape.c:2808 msgid "Test writing blocks of 64512 bytes to tape.\n" msgstr "" -#: src/stored/btape.c:2811 +#: src/stored/btape.c:2810 msgid "How many blocks do you want to write? (1000): " msgstr "" -#: src/stored/btape.c:2828 +#: src/stored/btape.c:2827 #, c-format msgid "Begin writing %d Bacula blocks to tape ...\n" msgstr "" -#: src/stored/btape.c:2871 +#: src/stored/btape.c:2870 #, c-format msgid "Begin writing raw blocks of %u bytes.\n" msgstr "" -#: src/stored/btape.c:2902 +#: src/stored/btape.c:2901 msgid "test autochanger" msgstr "" -#: src/stored/btape.c:2903 +#: src/stored/btape.c:2902 msgid "backspace file" msgstr "" -#: src/stored/btape.c:2904 +#: src/stored/btape.c:2903 msgid "backspace record" msgstr "" -#: src/stored/btape.c:2905 +#: src/stored/btape.c:2904 msgid "list device capabilities" msgstr "" -#: src/stored/btape.c:2906 +#: src/stored/btape.c:2905 msgid "clear tape errors" msgstr "" -#: src/stored/btape.c:2907 +#: src/stored/btape.c:2906 msgid "go to end of Bacula data for append" msgstr "" -#: src/stored/btape.c:2908 +#: src/stored/btape.c:2907 msgid "go to the physical end of medium" msgstr "" -#: src/stored/btape.c:2909 +#: src/stored/btape.c:2908 msgid "fill tape, write onto second volume" msgstr "" -#: src/stored/btape.c:2910 +#: src/stored/btape.c:2909 msgid "read filled tape" msgstr "" -#: src/stored/btape.c:2911 +#: src/stored/btape.c:2910 msgid "forward space a file" msgstr "" -#: src/stored/btape.c:2912 +#: src/stored/btape.c:2911 msgid "forward space a record" msgstr "" -#: src/stored/btape.c:2913 +#: src/stored/btape.c:2912 msgid "print this command" msgstr "" -#: src/stored/btape.c:2914 +#: src/stored/btape.c:2913 msgid "write a Bacula label to the tape" msgstr "" -#: src/stored/btape.c:2915 +#: src/stored/btape.c:2914 msgid "load a tape" msgstr "" -#: src/stored/btape.c:2916 +#: src/stored/btape.c:2915 msgid "quit btape" msgstr "" -#: src/stored/btape.c:2917 +#: src/stored/btape.c:2916 msgid "use write() to fill tape" msgstr "" -#: src/stored/btape.c:2918 +#: src/stored/btape.c:2917 msgid "read and print the Bacula tape label" msgstr "" -#: src/stored/btape.c:2919 +#: src/stored/btape.c:2918 msgid "test record handling functions" msgstr "" -#: src/stored/btape.c:2920 +#: src/stored/btape.c:2919 msgid "rewind the tape" msgstr "" -#: src/stored/btape.c:2921 +#: src/stored/btape.c:2920 msgid "read() tape block by block to EOT and report" msgstr "" -#: src/stored/btape.c:2922 +#: src/stored/btape.c:2921 msgid "Bacula read block by block to EOT and report" msgstr "" -#: src/stored/btape.c:2923 +#: src/stored/btape.c:2922 msgid "" "[file_size=n(GB)|nb_file=3|skip_zero|skip_random|skip_raw|skip_block] report " "drive speed" msgstr "" -#: src/stored/btape.c:2924 +#: src/stored/btape.c:2923 msgid "print tape status" msgstr "" -#: src/stored/btape.c:2925 +#: src/stored/btape.c:2924 msgid "General test Bacula tape functions" msgstr "" -#: src/stored/btape.c:2926 +#: src/stored/btape.c:2925 msgid "write an EOF on the tape" msgstr "" -#: src/stored/btape.c:2927 +#: src/stored/btape.c:2926 msgid "write a single Bacula block" msgstr "" -#: src/stored/btape.c:2928 +#: src/stored/btape.c:2927 msgid "read a single record" msgstr "" -#: src/stored/btape.c:2929 +#: src/stored/btape.c:2928 msgid "read a single Bacula block" msgstr "" -#: src/stored/btape.c:2930 +#: src/stored/btape.c:2929 msgid "quick fill command" msgstr "" -#: src/stored/btape.c:2951 +#: src/stored/btape.c:2950 #, c-format msgid "\"%s\" is an invalid command\n" msgstr "" -#: src/stored/btape.c:2960 +#: src/stored/btape.c:2959 #, c-format msgid "Interactive commands:\n" msgstr "" -#: src/stored/btape.c:2971 +#: src/stored/btape.c:2970 #, c-format msgid "" "\n" @@ -15000,27 +15000,27 @@ msgid "" "\n" msgstr "" -#: src/stored/btape.c:3042 +#: src/stored/btape.c:3041 #, c-format msgid "Mount second Volume on device %s and press return when ready: " msgstr "" -#: src/stored/btape.c:3070 +#: src/stored/btape.c:3069 #, c-format msgid "Mount blank Volume on device %s and press return when ready: " msgstr "" -#: src/stored/btape.c:3090 +#: src/stored/btape.c:3089 #, c-format msgid "End of Volume \"%s\" %d records.\n" msgstr "" -#: src/stored/btape.c:3104 +#: src/stored/btape.c:3103 #, c-format msgid "Read block=%u, VolBytes=%s rate=%sB/s\n" msgstr "" -#: src/stored/btape.c:3117 +#: src/stored/btape.c:3116 #, c-format msgid "Cannot open Dev=%s, Vol=%s\n" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-06-30 08:32+0200\n" +"POT-Creation-Date: 2017-07-23 18:30+0200\n" "PO-Revision-Date: 2007-06-25 20:38+0200\n" "Last-Translator: Kern Sibbald <kern@sibbald.com>\n" "Language-Team: \n" @@ -39,8 +39,8 @@ msgstr "" msgid "*None*" msgstr "" -#: src/cats/cats.c:137 src/cats/mysql.c:487 src/cats/postgresql.c:583 -#: src/cats/postgresql.c:634 src/cats/sqlite.c:488 +#: src/cats/cats.c:137 src/cats/mysql.c:488 src/cats/postgresql.c:606 +#: src/cats/postgresql.c:657 src/cats/sqlite.c:488 #, c-format msgid "Query failed: %s: ERR=%s\n" msgstr "Abfrage gescheitert: %s: ERR=%s\n" @@ -53,12 +53,12 @@ msgstr "" msgid "A user name for MySQL must be supplied.\n" msgstr "Ein Benutzername fr MySQL muss angegeben werden.\n" -#: src/cats/mysql.c:210 src/cats/postgresql.c:247 src/cats/sqlite.c:184 +#: src/cats/mysql.c:211 src/cats/postgresql.c:256 src/cats/sqlite.c:184 #, c-format msgid "Unable to initialize DB lock. ERR=%s\n" msgstr "Kann DB lock nicht initialisieren. ERR=%s\n" -#: src/cats/mysql.c:267 +#: src/cats/mysql.c:268 #, fuzzy, c-format msgid "" "Unable to connect to MySQL server.\n" @@ -71,17 +71,17 @@ msgstr "" "Der Datenbankserver luft mglicherweise nicht oder das Passwort ist nicht " "korrekt.\n" -#: src/cats/mysql.c:463 src/cats/postgresql.c:529 src/cats/sqlite.c:411 +#: src/cats/mysql.c:464 src/cats/postgresql.c:552 src/cats/sqlite.c:411 #: src/dird/fd_cmds.c:960 src/dird/fd_cmds.c:1021 #, c-format msgid "Attribute create error. %s" msgstr "Attribute create error. %s" -#: src/cats/postgresql.c:110 +#: src/cats/postgresql.c:119 msgid "A user name for PostgreSQL must be supplied.\n" msgstr "Ein Benutzername fr PostgreSQL muss angegeben werden.\n" -#: src/cats/postgresql.c:205 src/cats/sql.c:531 src/cats/sql.c:538 +#: src/cats/postgresql.c:214 src/cats/sql.c:531 src/cats/sql.c:538 #: src/cats/sql_create.c:559 src/cats/sql_get.c:191 src/cats/sql_get.c:242 #: src/cats/sql_get.c:613 src/cats/sql_get.c:824 src/cats/sql_get.c:1152 #: src/cats/sql_get.c:1543 src/cats/sql_get.c:1695 @@ -89,12 +89,12 @@ msgstr "Ein Benutzername fr PostgreSQL muss angegeben werden.\n" msgid "error fetching row: %s\n" msgstr "Fehler beim holen von Zeile: %s\n" -#: src/cats/postgresql.c:217 +#: src/cats/postgresql.c:226 #, c-format msgid "Encoding error for database \"%s\". Wanted SQL_ASCII, got %s\n" msgstr "" -#: src/cats/postgresql.c:307 +#: src/cats/postgresql.c:330 #, fuzzy, c-format msgid "" "Unable to connect to PostgreSQL server. Database=%s User=%s\n" @@ -106,39 +106,39 @@ msgstr "" "Der Datenbankserver luft mglicherweise nicht oder das Passwort ist nicht " "korrekt.\n" -#: src/cats/postgresql.c:423 +#: src/cats/postgresql.c:446 msgid "PQescapeStringConn returned non-zero.\n" msgstr "" -#: src/cats/postgresql.c:443 +#: src/cats/postgresql.c:466 msgid "PQescapeByteaConn returned NULL.\n" msgstr "" -#: src/cats/postgresql.c:472 +#: src/cats/postgresql.c:495 msgid "PQunescapeByteaConn returned NULL.\n" msgstr "" -#: src/cats/postgresql.c:590 +#: src/cats/postgresql.c:613 #, fuzzy, c-format msgid "Fetch failed: ERR=%s\n" msgstr "pthread_create: ERR=%s\n" -#: src/cats/postgresql.c:883 +#: src/cats/postgresql.c:906 #, c-format msgid "error fetching currval: %s\n" msgstr "Fehler beim Holen des aktuellen Wertes: %s\n" -#: src/cats/postgresql.c:1064 +#: src/cats/postgresql.c:1087 #, fuzzy, c-format msgid "error starting batch mode: %s" msgstr "Fehler beim holen von Zeile: %s\n" -#: src/cats/postgresql.c:1094 src/cats/postgresql.c:1101 +#: src/cats/postgresql.c:1117 src/cats/postgresql.c:1124 #, fuzzy, c-format msgid "error ending batch mode: %s" msgstr "Fehler beim holen von Zeile: %s\n" -#: src/cats/postgresql.c:1151 +#: src/cats/postgresql.c:1174 #, fuzzy, c-format msgid "error copying in batch mode: %s" msgstr "Fehler beim holen von Zeile: %s\n" @@ -755,7 +755,7 @@ msgstr "Bitte die Konfigurationsdatei korrigieren: %s\n" #: src/console/bbconsjson.c:432 src/console/bbconsjson.c:463 #: src/console/console.c:1422 src/console/console.c:1452 -#: src/dird/bdirjson.c:1184 src/dird/bdirjson.c:1222 src/dird/bdirjson.c:1277 +#: src/dird/bdirjson.c:1185 src/dird/bdirjson.c:1223 src/dird/bdirjson.c:1278 #: src/dird/dird.c:778 src/dird/dird.c:996 src/dird/dird.c:1051 #: src/dird/dird.c:1254 src/filed/bfdjson.c:484 src/filed/bfdjson.c:527 #: src/filed/bfdjson.c:562 src/filed/filed.c:390 src/filed/filed.c:590 @@ -1432,7 +1432,7 @@ msgstr "" " -? diese Meldung ausgeben.\n" "\n" -#: src/dird/bdirjson.c:1162 src/dird/dird.c:756 +#: src/dird/bdirjson.c:1163 src/dird/dird.c:756 #, c-format msgid "" "No Director resource defined in %s\n" @@ -1441,30 +1441,30 @@ msgstr "" "Keine Director resource definiert in %s\n" "Ohne dies weiss ich nicht wer ich bin :-(\n" -#: src/dird/bdirjson.c:1170 src/dird/dird.c:764 src/filed/bfdjson.c:477 +#: src/dird/bdirjson.c:1171 src/dird/dird.c:764 src/filed/bfdjson.c:477 #: src/filed/filed.c:352 #, c-format msgid "No Messages resource defined in %s\n" msgstr "Keine Messages resource definiert in %s\n" -#: src/dird/bdirjson.c:1175 src/dird/dird.c:769 +#: src/dird/bdirjson.c:1176 src/dird/dird.c:769 #, c-format msgid "Only one Director resource permitted in %s\n" msgstr "Nur eine Director resource erlaubt in %s\n" -#: src/dird/bdirjson.c:1192 src/dird/dird.c:786 src/filed/bfdjson.c:537 +#: src/dird/bdirjson.c:1193 src/dird/dird.c:786 src/filed/bfdjson.c:537 #: src/filed/filed.c:600 src/stored/bsdjson.c:607 src/stored/stored.c:447 #, fuzzy, c-format msgid "\"TLS Certificate\" file not defined for Director \"%s\" in %s.\n" msgstr "\"TLS Key\" Datei nicht fr Director definiert \"%s\" in %s.\n" -#: src/dird/bdirjson.c:1198 src/dird/dird.c:792 src/filed/bfdjson.c:543 +#: src/dird/bdirjson.c:1199 src/dird/dird.c:792 src/filed/bfdjson.c:543 #: src/filed/filed.c:606 src/stored/bsdjson.c:613 src/stored/stored.c:453 #, c-format msgid "\"TLS Key\" file not defined for Director \"%s\" in %s.\n" msgstr "\"TLS Key\" Datei nicht fr Director definiert \"%s\" in %s.\n" -#: src/dird/bdirjson.c:1205 src/dird/dird.c:799 src/filed/bfdjson.c:549 +#: src/dird/bdirjson.c:1206 src/dird/dird.c:799 src/filed/bfdjson.c:549 #: src/filed/filed.c:612 src/stored/bsdjson.c:619 src/stored/stored.c:459 #, c-format msgid "" @@ -1476,19 +1476,19 @@ msgstr "" "Director \"%s\" in %s definert. Mindestens ein CA certificate store wird " "bentigt wenn \"TLS Verify Peer\" eingesetzt wird.\n" -#: src/dird/bdirjson.c:1231 src/dird/dird.c:1005 src/filed/bfdjson.c:572 +#: src/dird/bdirjson.c:1232 src/dird/dird.c:1005 src/filed/bfdjson.c:572 #: src/filed/filed.c:653 #, c-format msgid "\"TLS Certificate\" file not defined for Console \"%s\" in %s.\n" msgstr "\"TLS Certificate\" Datei nicht definiert fr Console \"%s\" in %s.\n" -#: src/dird/bdirjson.c:1237 src/dird/dird.c:1011 src/filed/bfdjson.c:578 +#: src/dird/bdirjson.c:1238 src/dird/dird.c:1011 src/filed/bfdjson.c:578 #: src/filed/filed.c:659 #, c-format msgid "\"TLS Key\" file not defined for Console \"%s\" in %s.\n" msgstr "\"TLS Key\" Datei nicht definiert fr Console \"%s\" in %s.\n" -#: src/dird/bdirjson.c:1244 src/dird/dird.c:1018 src/filed/bfdjson.c:584 +#: src/dird/bdirjson.c:1245 src/dird/dird.c:1018 src/filed/bfdjson.c:584 #: src/filed/filed.c:665 #, c-format msgid "" @@ -1500,14 +1500,14 @@ msgstr "" "frConsole \"%s\" in %s. Mindestens ein CA certificate store wird bentigt " "beiEinsatz von \"TLS Verify Peer\".\n" -#: src/dird/bdirjson.c:1261 src/dird/dird.c:1035 src/dird/dird.c:1075 +#: src/dird/bdirjson.c:1262 src/dird/dird.c:1035 src/dird/dird.c:1075 #: src/filed/filed.c:415 #, c-format msgid "Failed to initialize TLS context for File daemon \"%s\" in %s.\n" msgstr "" "Konnte TLS context fr File daemon \"%s\" in %s nicht initialisieren.\n" -#: src/dird/bdirjson.c:1284 src/dird/dird.c:1058 +#: src/dird/bdirjson.c:1285 src/dird/dird.c:1058 #, c-format msgid "" "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for " @@ -1516,29 +1516,29 @@ msgstr "" "Weder \"TLS CA Certificate\" noch \"TLS CA Certificate Dir\" sind definiert " "fr File daemon \"%s\" in %s.\n" -#: src/dird/bdirjson.c:1293 src/dird/dird.c:826 +#: src/dird/bdirjson.c:1294 src/dird/dird.c:826 #, c-format msgid "No Job records defined in %s\n" msgstr "Keine Job records definiert in %s\n" -#: src/dird/bdirjson.c:1353 src/dird/bdirjson.c:1366 src/dird/dird.c:877 +#: src/dird/bdirjson.c:1354 src/dird/bdirjson.c:1367 src/dird/dird.c:877 #: src/dird/dird.c:890 #, c-format msgid "Hey something is wrong. p=0x%lu\n" msgstr "Hey etwas luft schief. p=0x%lu\n" -#: src/dird/bdirjson.c:1452 src/dird/dird.c:960 +#: src/dird/bdirjson.c:1453 src/dird/dird.c:960 #, c-format msgid "\"%s\" directive in Job \"%s\" resource is required, but not found.\n" msgstr "" "\"%s\" Directive in Job \"%s\" resource wird bentigt, wurde aber nicht " "gefunden.\n" -#: src/dird/bdirjson.c:1459 src/dird/dird.c:967 +#: src/dird/bdirjson.c:1460 src/dird/dird.c:967 msgid "Too many items in Job resource\n" msgstr "zu viele items in Job resource\n" -#: src/dird/bdirjson.c:1463 src/dird/dird.c:971 +#: src/dird/bdirjson.c:1464 src/dird/dird.c:971 #, c-format msgid "No storage specified in Job \"%s\" nor in Pool.\n" msgstr "Weder storage noch Pool in Job \"%s\" definiert.\n" @@ -4146,12 +4146,12 @@ msgstr "" msgid "Enter base volume name: " msgstr "" -#: src/dird/ua_cmds.c:368 src/dird/ua_label.c:652 +#: src/dird/ua_cmds.c:368 src/dird/ua_label.c:654 #, fuzzy msgid "Volume name too long.\n" msgstr "Job nicht gefunden: %s\n" -#: src/dird/ua_cmds.c:372 src/dird/ua_label.c:658 src/lib/edit.c:519 +#: src/dird/ua_cmds.c:372 src/dird/ua_label.c:660 src/lib/edit.c:519 msgid "Volume name must be at least one character long.\n" msgstr "" @@ -4772,12 +4772,12 @@ msgstr "" msgid "Slot too large.\n" msgstr "Job nicht gefunden: %s\n" -#: src/dird/ua_label.c:178 src/dird/ua_label.c:356 src/dird/ua_label.c:1185 +#: src/dird/ua_label.c:178 src/dird/ua_label.c:356 src/dird/ua_label.c:1190 #: src/dird/ua_run.c:473 src/dird/ua_run.c:1356 src/dird/ua_run.c:1361 msgid "Command input" msgstr "" -#: src/dird/ua_label.c:196 src/dird/ua_label.c:520 src/dird/ua_label.c:1192 +#: src/dird/ua_label.c:196 src/dird/ua_label.c:520 src/dird/ua_label.c:1197 msgid "No slots in changer to scan.\n" msgstr "" @@ -4786,7 +4786,7 @@ msgstr "" msgid "No Volumes found to label, or no barcodes.\n" msgstr "Keine Volumes zum Wiederherstellen gefunden.\n" -#: src/dird/ua_label.c:218 src/dird/ua_label.c:1213 +#: src/dird/ua_label.c:218 src/dird/ua_label.c:1219 #, fuzzy, c-format msgid "Slot %d greater than max %d ignored.\n" msgstr "" @@ -4887,71 +4887,71 @@ msgstr "" msgid "Catalog error on cleaning tape: %s" msgstr "Catalog Fehler beim Erzeugen des JobMedia Eintrags. %s" -#: src/dird/ua_label.c:645 +#: src/dird/ua_label.c:647 #, fuzzy, c-format msgid "Illegal character \"%c\" in a volume name.\n" msgstr "Illegales Zeichen in \"Volume name\" \"%s\"\n" -#: src/dird/ua_label.c:693 +#: src/dird/ua_label.c:695 #, c-format msgid "Sending relabel command from \"%s\" to \"%s\" ...\n" msgstr "" -#: src/dird/ua_label.c:700 +#: src/dird/ua_label.c:702 #, fuzzy, c-format msgid "Sending label command for Volume \"%s\" Slot %d ...\n" msgstr "Media Eintrag fr Volume \"%s\" nicht gefunden.\n" -#: src/dird/ua_label.c:730 +#: src/dird/ua_label.c:732 #, fuzzy, c-format msgid "Catalog record for Volume \"%s\", Slot %d successfully created.\n" msgstr "Media Eintrag fr Volume \"%s\" nicht gefunden.\n" -#: src/dird/ua_label.c:745 +#: src/dird/ua_label.c:747 #, fuzzy, c-format msgid "Label command failed for Volume %s.\n" msgstr "Mehr als ein Dateiname! %s fr Datei: %s\n" -#: src/dird/ua_label.c:759 +#: src/dird/ua_label.c:761 #, fuzzy msgid "Could not open SD socket.\n" msgstr "Konnte Datenbank \"%s\" nicht ffen.\n" -#: src/dird/ua_label.c:831 src/dird/ua_label.c:841 +#: src/dird/ua_label.c:833 src/dird/ua_label.c:843 #, fuzzy, c-format msgid "Invalid Slot number: %s\n" msgstr "Ungltige Catalog Anfrage: %s" -#: src/dird/ua_label.c:850 +#: src/dird/ua_label.c:852 #, c-format msgid "Invalid Volume name: %s. Volume skipped.\n" msgstr "" -#: src/dird/ua_label.c:944 +#: src/dird/ua_label.c:946 #, fuzzy, c-format msgid "Device \"%s\" has %d slots.\n" msgstr "Pool Ressource \"%s\" nicht gefunden.\n" -#: src/dird/ua_label.c:990 +#: src/dird/ua_label.c:995 #, fuzzy, c-format msgid "Pool \"%s\" resource not found for volume \"%s\"!\n" msgstr "Job Ressource fr \"%s\"nicht gefunden.\n" -#: src/dird/ua_label.c:1204 +#: src/dird/ua_label.c:1209 #, fuzzy msgid "No Volumes found, or no barcodes.\n" msgstr "Keine Volumes zum Wiederherstellen gefunden.\n" -#: src/dird/ua_label.c:1207 +#: src/dird/ua_label.c:1212 src/dird/ua_label.c:1214 src/dird/ua_label.c:1247 msgid "" -" Slot | Volume Name | Status | Media Type | " -"Pool |\n" +"+------+----------------------+-----------+-----------------" +"+--------------------+\n" msgstr "" -#: src/dird/ua_label.c:1208 +#: src/dird/ua_label.c:1213 msgid "" -"------+------------------+-----------+----------------------" -"+--------------------|\n" +"| Slot | Volume Name | Status | Media Type | " +"Pool |\n" msgstr "" #: src/dird/ua_output.c:57 src/dird/ua_output.c:81 @@ -7397,7 +7397,7 @@ msgstr "" msgid "%d total files; %d marked to be restored; %s bytes.\n" msgstr "" -#: src/dird/ua_tree.c:796 src/stored/btape.c:2961 +#: src/dird/ua_tree.c:796 src/stored/btape.c:2960 #, c-format msgid "" " Command Description\n" @@ -8459,27 +8459,27 @@ msgstr "Netzwerkfehler mit FD bei %s: ERR=%s\n" msgid "Compression deflateParams error: %d\n" msgstr "" -#: src/filed/backup.c:1105 +#: src/filed/backup.c:1103 #, fuzzy, c-format msgid " Cannot open resource fork for \"%s\": ERR=%s.\n" msgstr "Kann Ausdruck\"%s\"nicht auflsen: ERR=%s\n" -#: src/filed/backup.c:1163 +#: src/filed/backup.c:1161 #, fuzzy, c-format msgid "Compression deflate error: %d\n" msgstr "Regex bersetzungsfehler. ERR=%s\n" -#: src/filed/backup.c:1170 +#: src/filed/backup.c:1168 #, c-format msgid "Compression deflateReset error: %d\n" msgstr "" -#: src/filed/backup.c:1212 +#: src/filed/backup.c:1210 #, fuzzy, c-format msgid "Compression LZO error: %d\n" msgstr "Regex bersetzungsfehler. ERR=%s\n" -#: src/filed/backup.c:1422 +#: src/filed/backup.c:1420 #, c-format msgid "VSS Writer (BackupComplete): %s\n" msgstr "" @@ -13184,7 +13184,7 @@ msgstr "Konnte Job Eintrag nicht holen. ERR=%s\n" msgid "NULL Volume name. This shouldn't happen!!!\n" msgstr "" -#: src/stored/append.c:123 src/stored/btape.c:2240 +#: src/stored/append.c:123 src/stored/btape.c:2239 #, fuzzy, c-format msgid "Write session label failed. ERR=%s\n" msgstr "Fehler beim Aktualisieren der DB Media Datei. ERR=%s\n" @@ -13225,7 +13225,7 @@ msgstr "Socket Fehler auf %s Kommando: ERR=%s\n" msgid "Set ok=FALSE after write_block_to_device.\n" msgstr "Fehler beim schreiben der bsr Datei.\n" -#: src/stored/append.c:319 src/stored/btape.c:2359 +#: src/stored/append.c:319 src/stored/btape.c:2358 #, fuzzy, c-format msgid "Error writing end session label. ERR=%s\n" msgstr "Fehler beim Aktualisieren der DB Media Datei. ERR=%s\n" @@ -13245,7 +13245,7 @@ msgstr "" msgid "Error updating file attributes. ERR=%s\n" msgstr "Fehler beim Aktualisieren des Client Eintrags. ERR=%s\n" -#: src/stored/askdir.c:160 src/stored/btape.c:3045 +#: src/stored/askdir.c:160 src/stored/btape.c:3044 #, c-format msgid "Mount Volume \"%s\" on device %s and press return when ready: " msgstr "" @@ -13572,7 +13572,7 @@ msgid "Copy skipped. Record does not match BSR filter.\n" msgstr "" #: src/stored/bcopy.c:270 src/stored/bcopy.c:278 src/stored/bcopy.c:306 -#: src/stored/btape.c:2768 +#: src/stored/btape.c:2767 #, fuzzy, c-format msgid "Cannot fixup device error. %s\n" msgstr "Kann Client resource %s nicht finden\n" @@ -14717,7 +14717,7 @@ msgstr "" msgid "Do you want to continue? (y/n): " msgstr "" -#: src/stored/btape.c:751 src/stored/btape.c:2203 +#: src/stored/btape.c:751 src/stored/btape.c:2202 msgid "Command aborted.\n" msgstr "" @@ -14746,14 +14746,14 @@ msgstr "" #: src/stored/btape.c:813 src/stored/btape.c:824 src/stored/btape.c:835 #: src/stored/btape.c:1153 src/stored/btape.c:1169 src/stored/btape.c:1910 -#: src/stored/btape.c:2835 +#: src/stored/btape.c:2834 #, fuzzy msgid "Error writing record to block.\n" msgstr "Fehler beim schreiben der bsr Datei.\n" #: src/stored/btape.c:817 src/stored/btape.c:828 src/stored/btape.c:839 #: src/stored/btape.c:1157 src/stored/btape.c:1173 src/stored/btape.c:1914 -#: src/stored/btape.c:2839 +#: src/stored/btape.c:2838 #, fuzzy msgid "Error writing block to device.\n" msgstr "Fehler beim schreiben der bsr Datei.\n" @@ -14830,7 +14830,7 @@ msgstr "" msgid "Begin writing %i files of %sB with raw blocks of %u bytes.\n" msgstr "" -#: src/stored/btape.c:931 src/stored/btape.c:2891 +#: src/stored/btape.c:931 src/stored/btape.c:2890 #, fuzzy, c-format msgid "Write failed at block %u. stat=%d ERR=%s\n" msgstr "Catalog Fehler beim Aktualisieren von volume \"%s\". ERR=%s" @@ -15387,7 +15387,7 @@ msgstr "" msgid "Read of %d bytes gives stat=%d. ERR=%s\n" msgstr "" -#: src/stored/btape.c:1970 src/stored/btape.c:2019 +#: src/stored/btape.c:1970 src/stored/btape.c:2018 #, fuzzy, c-format msgid "End of tape\n" msgstr "" @@ -15409,51 +15409,51 @@ msgstr "Catalog Fehler beim Aktualisieren von volume \"%s\". ERR=%s" msgid "Bad status from read %d. ERR=%s\n" msgstr "Konnte bootstrap Datei %s nicht erzeugen. ERR=%s\n" -#: src/stored/btape.c:1985 src/stored/btape.c:1999 src/stored/btape.c:2063 -#: src/stored/btape.c:2075 src/stored/btape.c:2088 src/stored/btape.c:2104 +#: src/stored/btape.c:1985 src/stored/btape.c:1999 src/stored/btape.c:2062 +#: src/stored/btape.c:2074 src/stored/btape.c:2087 src/stored/btape.c:2103 #, c-format msgid "1 block of %d bytes in file %d\n" msgstr "" -#: src/stored/btape.c:1988 src/stored/btape.c:2002 src/stored/btape.c:2066 -#: src/stored/btape.c:2078 src/stored/btape.c:2091 src/stored/btape.c:2107 +#: src/stored/btape.c:1988 src/stored/btape.c:2002 src/stored/btape.c:2065 +#: src/stored/btape.c:2077 src/stored/btape.c:2090 src/stored/btape.c:2106 #, c-format msgid "%d blocks of %d bytes in file %d\n" msgstr "" -#: src/stored/btape.c:2010 src/stored/btape.c:2082 +#: src/stored/btape.c:2010 src/stored/btape.c:2081 #, c-format msgid "End of File mark.\n" msgstr "" -#: src/stored/btape.c:2031 src/stored/btape.c:2135 +#: src/stored/btape.c:2030 src/stored/btape.c:2134 #, c-format msgid "Total files=%d, blocks=%d, bytes = %s\n" msgstr "" -#: src/stored/btape.c:2095 +#: src/stored/btape.c:2094 #, fuzzy, c-format msgid "Short block read.\n" msgstr "Job Einrichtung Fehlgeschlagen.\n" -#: src/stored/btape.c:2098 +#: src/stored/btape.c:2097 #, fuzzy, c-format msgid "Error reading block. ERR=%s\n" msgstr "Fehler beim aktualisieren der DB Job Datei . ERR=%s\n" -#: src/stored/btape.c:2122 +#: src/stored/btape.c:2121 #, c-format msgid "" "Block=%u file,blk=%u,%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s " "rlen=%d\n" msgstr "" -#: src/stored/btape.c:2144 +#: src/stored/btape.c:2143 #, c-format msgid "Device status: %u. ERR=%s\n" msgstr "" -#: src/stored/btape.c:2176 +#: src/stored/btape.c:2175 #, c-format msgid "" "\n" @@ -15479,84 +15479,84 @@ msgid "" "\n" msgstr "" -#: src/stored/btape.c:2194 +#: src/stored/btape.c:2193 msgid "" "Do you want to run the simplified test (s) with one tape\n" "or the complete multiple tape (m) test: (s/m) " msgstr "" -#: src/stored/btape.c:2197 +#: src/stored/btape.c:2196 msgid "Simple test (single tape) selected.\n" msgstr "" -#: src/stored/btape.c:2200 +#: src/stored/btape.c:2199 msgid "Multiple tape test selected.\n" msgstr "" -#: src/stored/btape.c:2244 +#: src/stored/btape.c:2243 #, fuzzy msgid "Wrote Start of Session label.\n" msgstr "Fehler beim Aktualisieren der DB Media Datei. ERR=%s\n" -#: src/stored/btape.c:2263 +#: src/stored/btape.c:2262 #, c-format msgid "%s Begin writing Bacula records to tape ...\n" msgstr "" -#: src/stored/btape.c:2265 +#: src/stored/btape.c:2264 #, c-format msgid "%s Begin writing Bacula records to first tape ...\n" msgstr "" -#: src/stored/btape.c:2291 +#: src/stored/btape.c:2290 #, fuzzy msgid "Flush block failed.\n" msgstr "Job Einrichtung Fehlgeschlagen.\n" -#: src/stored/btape.c:2305 +#: src/stored/btape.c:2304 #, c-format msgid "Wrote block=%u, file,blk=%u,%u VolBytes=%s rate=%sB/s\n" msgstr "" -#: src/stored/btape.c:2316 +#: src/stored/btape.c:2315 #, fuzzy, c-format msgid "%s Flush block, write EOF\n" msgstr "Job Einrichtung Fehlgeschlagen.\n" -#: src/stored/btape.c:2325 +#: src/stored/btape.c:2324 msgid "Wrote 1000 blocks on second tape. Done.\n" msgstr "" -#: src/stored/btape.c:2330 +#: src/stored/btape.c:2329 msgid "Not OK\n" msgstr "" -#: src/stored/btape.c:2354 +#: src/stored/btape.c:2353 #, fuzzy msgid "Job canceled.\n" msgstr "%s Abgebrochen" -#: src/stored/btape.c:2365 +#: src/stored/btape.c:2364 #, fuzzy msgid "Set ok=false after write_block_to_device.\n" msgstr "Fehler beim schreiben der bsr Datei.\n" -#: src/stored/btape.c:2369 +#: src/stored/btape.c:2368 #, fuzzy msgid "Wrote End of Session label.\n" msgstr "Fehler beim Aktualisieren der DB Media Datei. ERR=%s\n" -#: src/stored/btape.c:2392 +#: src/stored/btape.c:2391 #, c-format msgid "Wrote state file last_block_num1=%d last_block_num2=%d\n" msgstr "" -#: src/stored/btape.c:2396 +#: src/stored/btape.c:2395 #, fuzzy, c-format msgid "Could not create state file: %s ERR=%s\n" msgstr "Kann bootstrap Datei nicht ffnen: %s: ERR=%s\n" -#: src/stored/btape.c:2407 +#: src/stored/btape.c:2406 #, c-format msgid "" "\n" @@ -15564,7 +15564,7 @@ msgid "" "%s Done filling tape at %d:%d. Now beginning re-read of tape ...\n" msgstr "" -#: src/stored/btape.c:2410 +#: src/stored/btape.c:2409 #, c-format msgid "" "\n" @@ -15572,24 +15572,24 @@ msgid "" "%s Done filling tapes at %d:%d. Now beginning re-read of first tape ...\n" msgstr "" -#: src/stored/btape.c:2416 +#: src/stored/btape.c:2415 #, fuzzy msgid "do_unfill failed.\n" msgstr "Job Einrichtung Fehlgeschlagen.\n" -#: src/stored/btape.c:2421 +#: src/stored/btape.c:2420 #, c-format msgid "%s: Error during test.\n" msgstr "" -#: src/stored/btape.c:2456 +#: src/stored/btape.c:2455 msgid "" "\n" "The state file level has changed. You must redo\n" "the fill command.\n" msgstr "" -#: src/stored/btape.c:2463 +#: src/stored/btape.c:2462 #, c-format msgid "" "\n" @@ -15597,95 +15597,95 @@ msgid "" "You must redo the fill command.\n" msgstr "" -#: src/stored/btape.c:2529 +#: src/stored/btape.c:2528 msgid "Mount first tape. Press enter when ready: " msgstr "" -#: src/stored/btape.c:2546 +#: src/stored/btape.c:2545 msgid "Rewinding.\n" msgstr "" -#: src/stored/btape.c:2551 +#: src/stored/btape.c:2550 #, c-format msgid "Reading the first 10000 records from %u:%u.\n" msgstr "" -#: src/stored/btape.c:2555 src/stored/btape.c:2627 +#: src/stored/btape.c:2554 src/stored/btape.c:2626 #, c-format msgid "Reposition from %u:%u to %u:%u\n" msgstr "" -#: src/stored/btape.c:2560 src/stored/btape.c:2614 src/stored/btape.c:2632 +#: src/stored/btape.c:2559 src/stored/btape.c:2613 src/stored/btape.c:2631 #, fuzzy, c-format msgid "Reposition error. ERR=%s\n" msgstr "Regex bersetzungsfehler. ERR=%s\n" -#: src/stored/btape.c:2563 +#: src/stored/btape.c:2562 #, c-format msgid "Reading block %u.\n" msgstr "" -#: src/stored/btape.c:2565 src/stored/btape.c:2619 src/stored/btape.c:2637 +#: src/stored/btape.c:2564 src/stored/btape.c:2618 src/stored/btape.c:2636 #, fuzzy, c-format msgid "Error reading block: ERR=%s\n" msgstr "Fehler beim Holen von Zeile %d: ERR=%s\n" -#: src/stored/btape.c:2570 +#: src/stored/btape.c:2569 msgid "" "\n" "The last block on the tape matches. Test succeeded.\n" "\n" msgstr "" -#: src/stored/btape.c:2573 +#: src/stored/btape.c:2572 msgid "" "\n" "The last block of the first tape matches.\n" "\n" msgstr "" -#: src/stored/btape.c:2597 +#: src/stored/btape.c:2596 msgid "Mount second tape. Press enter when ready: " msgstr "" -#: src/stored/btape.c:2611 +#: src/stored/btape.c:2610 #, c-format msgid "Reposition from %u:%u to 0:1\n" msgstr "" -#: src/stored/btape.c:2617 src/stored/btape.c:2635 +#: src/stored/btape.c:2616 src/stored/btape.c:2634 #, c-format msgid "Reading block %d.\n" msgstr "" -#: src/stored/btape.c:2623 +#: src/stored/btape.c:2622 msgid "" "\n" "The first block on the second tape matches.\n" "\n" msgstr "" -#: src/stored/btape.c:2641 +#: src/stored/btape.c:2640 msgid "" "\n" "The last block on the second tape matches. Test succeeded.\n" "\n" msgstr "" -#: src/stored/btape.c:2659 +#: src/stored/btape.c:2658 #, c-format msgid "10000 records read now at %d:%d\n" msgstr "" -#: src/stored/btape.c:2685 src/stored/btape.c:2696 src/stored/btape.c:2741 +#: src/stored/btape.c:2684 src/stored/btape.c:2695 src/stored/btape.c:2740 msgid "Last block written" msgstr "" -#: src/stored/btape.c:2687 src/stored/btape.c:2697 +#: src/stored/btape.c:2686 src/stored/btape.c:2696 msgid "Block read back" msgstr "" -#: src/stored/btape.c:2688 +#: src/stored/btape.c:2687 #, c-format msgid "" "\n" @@ -15693,7 +15693,7 @@ msgid "" "The blocks differ at byte %u\n" msgstr "" -#: src/stored/btape.c:2689 +#: src/stored/btape.c:2688 msgid "" "\n" "\n" @@ -15703,174 +15703,174 @@ msgid "" "to write multi-tape Volumes.!!!!\n" msgstr "" -#: src/stored/btape.c:2725 +#: src/stored/btape.c:2724 #, c-format msgid "Last block at: %u:%u this_dev_block_num=%d\n" msgstr "" -#: src/stored/btape.c:2739 +#: src/stored/btape.c:2738 #, c-format msgid "Block not written: FileIndex=%u blk_block=%u Size=%u\n" msgstr "" -#: src/stored/btape.c:2743 +#: src/stored/btape.c:2742 msgid "Block not written" msgstr "" -#: src/stored/btape.c:2758 +#: src/stored/btape.c:2757 #, c-format msgid "End of tape %d:%d. Volume Bytes=%s. Write rate = %sB/s\n" msgstr "" -#: src/stored/btape.c:2809 +#: src/stored/btape.c:2808 msgid "Test writing blocks of 64512 bytes to tape.\n" msgstr "" -#: src/stored/btape.c:2811 +#: src/stored/btape.c:2810 msgid "How many blocks do you want to write? (1000): " msgstr "" -#: src/stored/btape.c:2828 +#: src/stored/btape.c:2827 #, c-format msgid "Begin writing %d Bacula blocks to tape ...\n" msgstr "" -#: src/stored/btape.c:2871 +#: src/stored/btape.c:2870 #, c-format msgid "Begin writing raw blocks of %u bytes.\n" msgstr "" -#: src/stored/btape.c:2902 +#: src/stored/btape.c:2901 msgid "test autochanger" msgstr "" -#: src/stored/btape.c:2903 +#: src/stored/btape.c:2902 msgid "backspace file" msgstr "" -#: src/stored/btape.c:2904 +#: src/stored/btape.c:2903 msgid "backspace record" msgstr "" -#: src/stored/btape.c:2905 +#: src/stored/btape.c:2904 msgid "list device capabilities" msgstr "" -#: src/stored/btape.c:2906 +#: src/stored/btape.c:2905 #, fuzzy msgid "clear tape errors" msgstr "unbekannt" -#: src/stored/btape.c:2907 +#: src/stored/btape.c:2906 msgid "go to end of Bacula data for append" msgstr "" -#: src/stored/btape.c:2908 +#: src/stored/btape.c:2907 msgid "go to the physical end of medium" msgstr "" -#: src/stored/btape.c:2909 +#: src/stored/btape.c:2908 msgid "fill tape, write onto second volume" msgstr "" -#: src/stored/btape.c:2910 +#: src/stored/btape.c:2909 msgid "read filled tape" msgstr "" -#: src/stored/btape.c:2911 +#: src/stored/btape.c:2910 msgid "forward space a file" msgstr "" -#: src/stored/btape.c:2912 +#: src/stored/btape.c:2911 #, fuzzy msgid "forward space a record" msgstr "Job Ressource" -#: src/stored/btape.c:2913 +#: src/stored/btape.c:2912 msgid "print this command" msgstr "" -#: src/stored/btape.c:2914 +#: src/stored/btape.c:2913 msgid "write a Bacula label to the tape" msgstr "" -#: src/stored/btape.c:2915 +#: src/stored/btape.c:2914 msgid "load a tape" msgstr "" -#: src/stored/btape.c:2916 +#: src/stored/btape.c:2915 msgid "quit btape" msgstr "" -#: src/stored/btape.c:2917 +#: src/stored/btape.c:2916 msgid "use write() to fill tape" msgstr "" -#: src/stored/btape.c:2918 +#: src/stored/btape.c:2917 msgid "read and print the Bacula tape label" msgstr "" -#: src/stored/btape.c:2919 +#: src/stored/btape.c:2918 msgid "test record handling functions" msgstr "" -#: src/stored/btape.c:2920 +#: src/stored/btape.c:2919 msgid "rewind the tape" msgstr "" -#: src/stored/btape.c:2921 +#: src/stored/btape.c:2920 msgid "read() tape block by block to EOT and report" msgstr "" -#: src/stored/btape.c:2922 +#: src/stored/btape.c:2921 msgid "Bacula read block by block to EOT and report" msgstr "" -#: src/stored/btape.c:2923 +#: src/stored/btape.c:2922 msgid "" "[file_size=n(GB)|nb_file=3|skip_zero|skip_random|skip_raw|skip_block] report " "drive speed" msgstr "" -#: src/stored/btape.c:2924 +#: src/stored/btape.c:2923 msgid "print tape status" msgstr "" -#: src/stored/btape.c:2925 +#: src/stored/btape.c:2924 msgid "General test Bacula tape functions" msgstr "" -#: src/stored/btape.c:2926 +#: src/stored/btape.c:2925 msgid "write an EOF on the tape" msgstr "" -#: src/stored/btape.c:2927 +#: src/stored/btape.c:2926 msgid "write a single Bacula block" msgstr "" -#: src/stored/btape.c:2928 +#: src/stored/btape.c:2927 msgid "read a single record" msgstr "" -#: src/stored/btape.c:2929 +#: src/stored/btape.c:2928 msgid "read a single Bacula block" msgstr "" -#: src/stored/btape.c:2930 +#: src/stored/btape.c:2929 msgid "quick fill command" msgstr "" -#: src/stored/btape.c:2951 +#: src/stored/btape.c:2950 #, c-format msgid "\"%s\" is an invalid command\n" msgstr "" -#: src/stored/btape.c:2960 +#: src/stored/btape.c:2959 #, c-format msgid "Interactive commands:\n" msgstr "" -#: src/stored/btape.c:2971 +#: src/stored/btape.c:2970 #, fuzzy, c-format msgid "" "\n" @@ -15904,27 +15904,27 @@ msgstr "" " -? diese Meldung ausgeben.\n" "\n" -#: src/stored/btape.c:3042 +#: src/stored/btape.c:3041 #, c-format msgid "Mount second Volume on device %s and press return when ready: " msgstr "" -#: src/stored/btape.c:3070 +#: src/stored/btape.c:3069 #, c-format msgid "Mount blank Volume on device %s and press return when ready: " msgstr "" -#: src/stored/btape.c:3090 +#: src/stored/btape.c:3089 #, fuzzy, c-format msgid "End of Volume \"%s\" %d records.\n" msgstr "Neues Volume \"%s\" in catalog erzeugt.\n" -#: src/stored/btape.c:3104 +#: src/stored/btape.c:3103 #, c-format msgid "Read block=%u, VolBytes=%s rate=%sB/s\n" msgstr "" -#: src/stored/btape.c:3117 +#: src/stored/btape.c:3116 #, fuzzy, c-format msgid "Cannot open Dev=%s, Vol=%s\n" msgstr "Kann Ausdruck\"%s\"nicht auflsen: ERR=%s\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Bacula 3.0.2\n" "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-06-30 08:32+0200\n" +"POT-Creation-Date: 2017-07-23 18:30+0200\n" "PO-Revision-Date: 2009-12-01 16:04-0300\n" "Last-Translator: Victor Hugo dos Santos <listas.vhs@gmail.com>\n" "Language-Team: Bacula Spanish Team <bacula-users-es@lists.sourceforge.net>\n" @@ -41,8 +41,8 @@ msgstr "Fallo ASSERT: %s\n" msgid "*None*" msgstr "*Ninguno*" -#: src/cats/cats.c:137 src/cats/mysql.c:487 src/cats/postgresql.c:583 -#: src/cats/postgresql.c:634 src/cats/sqlite.c:488 +#: src/cats/cats.c:137 src/cats/mysql.c:488 src/cats/postgresql.c:606 +#: src/cats/postgresql.c:657 src/cats/sqlite.c:488 #, c-format msgid "Query failed: %s: ERR=%s\n" msgstr "Consulta fallida: %s: ERR=%s\n" @@ -55,12 +55,12 @@ msgstr "" msgid "A user name for MySQL must be supplied.\n" msgstr "Un nombre de usuario para MySQL debe de ser suministrado.\n" -#: src/cats/mysql.c:210 src/cats/postgresql.c:247 src/cats/sqlite.c:184 +#: src/cats/mysql.c:211 src/cats/postgresql.c:256 src/cats/sqlite.c:184 #, c-format msgid "Unable to initialize DB lock. ERR=%s\n" msgstr "No se puede inicializar el bloqueo de la BD. ERR=%s\n" -#: src/cats/mysql.c:267 +#: src/cats/mysql.c:268 #, c-format msgid "" "Unable to connect to MySQL server.\n" @@ -71,17 +71,17 @@ msgstr "" "No se puede conectar al servidor MySQL.\n" "Base de Datos=%s Usuario=%s\n" -#: src/cats/mysql.c:463 src/cats/postgresql.c:529 src/cats/sqlite.c:411 +#: src/cats/mysql.c:464 src/cats/postgresql.c:552 src/cats/sqlite.c:411 #: src/dird/fd_cmds.c:960 src/dird/fd_cmds.c:1021 #, c-format msgid "Attribute create error. %s" msgstr "error al crear Atributo.%s" -#: src/cats/postgresql.c:110 +#: src/cats/postgresql.c:119 msgid "A user name for PostgreSQL must be supplied.\n" msgstr "Un nombre de usuario para PostgreSQL debe de ser suministrado.\n" -#: src/cats/postgresql.c:205 src/cats/sql.c:531 src/cats/sql.c:538 +#: src/cats/postgresql.c:214 src/cats/sql.c:531 src/cats/sql.c:538 #: src/cats/sql_create.c:559 src/cats/sql_get.c:191 src/cats/sql_get.c:242 #: src/cats/sql_get.c:613 src/cats/sql_get.c:824 src/cats/sql_get.c:1152 #: src/cats/sql_get.c:1543 src/cats/sql_get.c:1695 @@ -89,14 +89,14 @@ msgstr "Un nombre de usuario para PostgreSQL debe de ser suministrado.\n" msgid "error fetching row: %s\n" msgstr "error al obtener la fila:%s\n" -#: src/cats/postgresql.c:217 +#: src/cats/postgresql.c:226 #, c-format msgid "Encoding error for database \"%s\". Wanted SQL_ASCII, got %s\n" msgstr "" "Error de codificación de la base de datos \"%s\". Busco SQL_ASCII, obtuvo " "%s\n" -#: src/cats/postgresql.c:307 +#: src/cats/postgresql.c:330 #, fuzzy, c-format msgid "" "Unable to connect to PostgreSQL server. Database=%s User=%s\n" @@ -107,41 +107,41 @@ msgstr "" "Base de datos=%s Usuario=%s\n" ", probablemente no funciona o tu contraseña es incorrecta.\n" -#: src/cats/postgresql.c:423 +#: src/cats/postgresql.c:446 msgid "PQescapeStringConn returned non-zero.\n" msgstr "PQescapeStringConn devuelto no-cero.\n" -#: src/cats/postgresql.c:443 +#: src/cats/postgresql.c:466 #, fuzzy msgid "PQescapeByteaConn returned NULL.\n" msgstr "PQescapeStringConn devuelto no-cero.\n" -#: src/cats/postgresql.c:472 +#: src/cats/postgresql.c:495 #, fuzzy msgid "PQunescapeByteaConn returned NULL.\n" msgstr "PQescapeStringConn devuelto no-cero.\n" -#: src/cats/postgresql.c:590 +#: src/cats/postgresql.c:613 #, fuzzy, c-format msgid "Fetch failed: ERR=%s\n" msgstr "prctl fallido: ERR=%s\n" -#: src/cats/postgresql.c:883 +#: src/cats/postgresql.c:906 #, c-format msgid "error fetching currval: %s\n" msgstr "error al obtener el valor: %s\n" -#: src/cats/postgresql.c:1064 +#: src/cats/postgresql.c:1087 #, c-format msgid "error starting batch mode: %s" msgstr "Error iniciando modo batch: %s" -#: src/cats/postgresql.c:1094 src/cats/postgresql.c:1101 +#: src/cats/postgresql.c:1117 src/cats/postgresql.c:1124 #, c-format msgid "error ending batch mode: %s" msgstr "Error finalizando modo batch: %s" -#: src/cats/postgresql.c:1151 +#: src/cats/postgresql.c:1174 #, c-format msgid "error copying in batch mode: %s" msgstr "Error copiando en modo batch: %s" @@ -757,7 +757,7 @@ msgstr "Por favor, corrija el archivo de configuración: %s\n" #: src/console/bbconsjson.c:432 src/console/bbconsjson.c:463 #: src/console/console.c:1422 src/console/console.c:1452 -#: src/dird/bdirjson.c:1184 src/dird/bdirjson.c:1222 src/dird/bdirjson.c:1277 +#: src/dird/bdirjson.c:1185 src/dird/bdirjson.c:1223 src/dird/bdirjson.c:1278 #: src/dird/dird.c:778 src/dird/dird.c:996 src/dird/dird.c:1051 #: src/dird/dird.c:1254 src/filed/bfdjson.c:484 src/filed/bfdjson.c:527 #: src/filed/bfdjson.c:562 src/filed/filed.c:390 src/filed/filed.c:590 @@ -1446,7 +1446,7 @@ msgstr "" " -? imprimir este mensaje.\n" "\n" -#: src/dird/bdirjson.c:1162 src/dird/dird.c:756 +#: src/dird/bdirjson.c:1163 src/dird/dird.c:756 #, c-format msgid "" "No Director resource defined in %s\n" @@ -1455,30 +1455,30 @@ msgstr "" "Recurso Director no definido en %s\n" "Sin eso no sé quién soy :-(\n" -#: src/dird/bdirjson.c:1170 src/dird/dird.c:764 src/filed/bfdjson.c:477 +#: src/dird/bdirjson.c:1171 src/dird/dird.c:764 src/filed/bfdjson.c:477 #: src/filed/filed.c:352 #, c-format msgid "No Messages resource defined in %s\n" msgstr "Recursos de Mensajes no definidos en %s\n" -#: src/dird/bdirjson.c:1175 src/dird/dird.c:769 +#: src/dird/bdirjson.c:1176 src/dird/dird.c:769 #, c-format msgid "Only one Director resource permitted in %s\n" msgstr "Sólo un recurso Director permitido en %s\n" -#: src/dird/bdirjson.c:1192 src/dird/dird.c:786 src/filed/bfdjson.c:537 +#: src/dird/bdirjson.c:1193 src/dird/dird.c:786 src/filed/bfdjson.c:537 #: src/filed/filed.c:600 src/stored/bsdjson.c:607 src/stored/stored.c:447 #, fuzzy, c-format msgid "\"TLS Certificate\" file not defined for Director \"%s\" in %s.\n" msgstr "Archivo \"TLS Certificate\" no definido para Storage \"%s\" en %s.\n" -#: src/dird/bdirjson.c:1198 src/dird/dird.c:792 src/filed/bfdjson.c:543 +#: src/dird/bdirjson.c:1199 src/dird/dird.c:792 src/filed/bfdjson.c:543 #: src/filed/filed.c:606 src/stored/bsdjson.c:613 src/stored/stored.c:453 #, c-format msgid "\"TLS Key\" file not defined for Director \"%s\" in %s.\n" msgstr "\"Clave TLS\" archivo no definido para director \"%s\" en %s.\n" -#: src/dird/bdirjson.c:1205 src/dird/dird.c:799 src/filed/bfdjson.c:549 +#: src/dird/bdirjson.c:1206 src/dird/dird.c:799 src/filed/bfdjson.c:549 #: src/filed/filed.c:612 src/stored/bsdjson.c:619 src/stored/stored.c:459 #, c-format msgid "" @@ -1490,20 +1490,20 @@ msgstr "" "para Director \"%s\" en %s. Al menos un almacén de certificado CA es " "requerido cuando se utiliza \"TLS Verify Peer\".\n" -#: src/dird/bdirjson.c:1231 src/dird/dird.c:1005 src/filed/bfdjson.c:572 +#: src/dird/bdirjson.c:1232 src/dird/dird.c:1005 src/filed/bfdjson.c:572 #: src/filed/filed.c:653 #, c-format msgid "\"TLS Certificate\" file not defined for Console \"%s\" in %s.\n" msgstr "" "Archivo de \"Certificado TLS\" no definido para Console \"%s\" en %s.\n" -#: src/dird/bdirjson.c:1237 src/dird/dird.c:1011 src/filed/bfdjson.c:578 +#: src/dird/bdirjson.c:1238 src/dird/dird.c:1011 src/filed/bfdjson.c:578 #: src/filed/filed.c:659 #, c-format msgid "\"TLS Key\" file not defined for Console \"%s\" in %s.\n" msgstr "Archivo de \"Llave TLS\" no definido para Console \"%s\" en %s.\n" -#: src/dird/bdirjson.c:1244 src/dird/dird.c:1018 src/filed/bfdjson.c:584 +#: src/dird/bdirjson.c:1245 src/dird/dird.c:1018 src/filed/bfdjson.c:584 #: src/filed/filed.c:665 #, c-format msgid "" @@ -1515,13 +1515,13 @@ msgstr "" "para Console \"%s\" en %s. Al menos un almacén de certificado CA es " "requerido cuando se utiliza \"TLS Verify Peer\".\n" -#: src/dird/bdirjson.c:1261 src/dird/dird.c:1035 src/dird/dird.c:1075 +#: src/dird/bdirjson.c:1262 src/dird/dird.c:1035 src/dird/dird.c:1075 #: src/filed/filed.c:415 #, c-format msgid "Failed to initialize TLS context for File daemon \"%s\" in %s.\n" msgstr "Fallo al inicializar contexto TLS para demonio File \"%s\" en %s.\n" -#: src/dird/bdirjson.c:1284 src/dird/dird.c:1058 +#: src/dird/bdirjson.c:1285 src/dird/dird.c:1058 #, c-format msgid "" "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for " @@ -1530,28 +1530,28 @@ msgstr "" "Ninguno \"TLS CA Certificate\" o \"TLS CA Certificate Dir\" esta definido " "para demonio File \"%s\" en %s.\n" -#: src/dird/bdirjson.c:1293 src/dird/dird.c:826 +#: src/dird/bdirjson.c:1294 src/dird/dird.c:826 #, c-format msgid "No Job records defined in %s\n" msgstr "Registros de Job no definidos en %s\n" -#: src/dird/bdirjson.c:1353 src/dird/bdirjson.c:1366 src/dird/dird.c:877 +#: src/dird/bdirjson.c:1354 src/dird/bdirjson.c:1367 src/dird/dird.c:877 #: src/dird/dird.c:890 #, c-format msgid "Hey something is wrong. p=0x%lu\n" msgstr "Oye, algo está mal. p=0x%lu\n" -#: src/dird/bdirjson.c:1452 src/dird/dird.c:960 +#: src/dird/bdirjson.c:1453 src/dird/dird.c:960 #, c-format msgid "\"%s\" directive in Job \"%s\" resource is required, but not found.\n" msgstr "" "Directiva \"%s\" en recurso Job \"%s\" es requerida, pero no se encuentra.\n" -#: src/dird/bdirjson.c:1459 src/dird/dird.c:967 +#: src/dird/bdirjson.c:1460 src/dird/dird.c:967 msgid "Too many items in Job resource\n" msgstr "Demasiados elementos en el recurso Job\n" -#: src/dird/bdirjson.c:1463 src/dird/dird.c:971 +#: src/dird/bdirjson.c:1464 src/dird/dird.c:971 #, c-format msgid "No storage specified in Job \"%s\" nor in Pool.\n" msgstr "Ningún storage especificada en Job \"%s\" ni en Pool.\n" @@ -4166,11 +4166,11 @@ msgstr "Introduzca nombre de Volumen:" msgid "Enter base volume name: " msgstr "Introduzca nombre de Volumen base:" -#: src/dird/ua_cmds.c:368 src/dird/ua_label.c:652 +#: src/dird/ua_cmds.c:368 src/dird/ua_label.c:654 msgid "Volume name too long.\n" msgstr "Nombre de Volumen demasiado largo.\n" -#: src/dird/ua_cmds.c:372 src/dird/ua_label.c:658 src/lib/edit.c:519 +#: src/dird/ua_cmds.c:372 src/dird/ua_label.c:660 src/lib/edit.c:519 msgid "Volume name must be at least one character long.\n" msgstr "Nombre de volumen debe ser de al menos un carácter de largo.\n" @@ -4821,13 +4821,13 @@ msgstr "Los valores deben ser ser mayor que cero.\n" msgid "Slot too large.\n" msgstr "Ranura demasiado grande.\n" -#: src/dird/ua_label.c:178 src/dird/ua_label.c:356 src/dird/ua_label.c:1185 +#: src/dird/ua_label.c:178 src/dird/ua_label.c:356 src/dird/ua_label.c:1190 #: src/dird/ua_run.c:473 src/dird/ua_run.c:1356 src/dird/ua_run.c:1361 #, fuzzy msgid "Command input" msgstr "línea de comandos" -#: src/dird/ua_label.c:196 src/dird/ua_label.c:520 src/dird/ua_label.c:1192 +#: src/dird/ua_label.c:196 src/dird/ua_label.c:520 src/dird/ua_label.c:1197 msgid "No slots in changer to scan.\n" msgstr "No hay ranuras en cambiador para analizar.\n" @@ -4835,7 +4835,7 @@ msgstr "No hay ranuras en cambiador para analizar.\n" msgid "No Volumes found to label, or no barcodes.\n" msgstr "No encontraron volúmenes para etiquetar, o sin códigos de barras.\n" -#: src/dird/ua_label.c:218 src/dird/ua_label.c:1213 +#: src/dird/ua_label.c:218 src/dird/ua_label.c:1219 #, c-format msgid "Slot %d greater than max %d ignored.\n" msgstr "Ranura %d mayor que el máximo %d ignorado.\n" @@ -4946,74 +4946,76 @@ msgstr "" msgid "Catalog error on cleaning tape: %s" msgstr "Error de catálogo en la limpieza de la cinta: %s" -#: src/dird/ua_label.c:645 +#: src/dird/ua_label.c:647 #, c-format msgid "Illegal character \"%c\" in a volume name.\n" msgstr "Ilegal carácter \"%c\" en un nombre de volumen.\n" -#: src/dird/ua_label.c:693 +#: src/dird/ua_label.c:695 #, c-format msgid "Sending relabel command from \"%s\" to \"%s\" ...\n" msgstr "Enviando comando relabel desde \"%s\" para \"%s\" ...\n" -#: src/dird/ua_label.c:700 +#: src/dird/ua_label.c:702 #, c-format msgid "Sending label command for Volume \"%s\" Slot %d ...\n" msgstr "Enviando comando relabel para Volumen \"%s\" Ranura %d ...\n" -#: src/dird/ua_label.c:730 +#: src/dird/ua_label.c:732 #, c-format msgid "Catalog record for Volume \"%s\", Slot %d successfully created.\n" msgstr "" "Registro Catalogo para Volumen \"%s\", Ranura %d creado correctamente.\n" -#: src/dird/ua_label.c:745 +#: src/dird/ua_label.c:747 #, c-format msgid "Label command failed for Volume %s.\n" msgstr "Comando Label fallido para Volumen %s.\n" -#: src/dird/ua_label.c:759 +#: src/dird/ua_label.c:761 msgid "Could not open SD socket.\n" msgstr "No se pudo abrir socket SD.\n" -#: src/dird/ua_label.c:831 src/dird/ua_label.c:841 +#: src/dird/ua_label.c:833 src/dird/ua_label.c:843 #, c-format msgid "Invalid Slot number: %s\n" msgstr "Número de Ranura no válido:%s\n" -#: src/dird/ua_label.c:850 +#: src/dird/ua_label.c:852 #, fuzzy, c-format msgid "Invalid Volume name: %s. Volume skipped.\n" msgstr "Nombre de Volumen no válido:%s\n" -#: src/dird/ua_label.c:944 +#: src/dird/ua_label.c:946 #, c-format msgid "Device \"%s\" has %d slots.\n" msgstr "Dispositivo \"%s\" tiene %d ranuras.\n" -#: src/dird/ua_label.c:990 +#: src/dird/ua_label.c:995 #, c-format msgid "Pool \"%s\" resource not found for volume \"%s\"!\n" msgstr "Recurso Pool \"%s\" no encontrado para volumen \"%s\"!\n" -#: src/dird/ua_label.c:1204 +#: src/dird/ua_label.c:1209 msgid "No Volumes found, or no barcodes.\n" msgstr "Volúmenes no encontrados, o no códigos de barras.\n" -#: src/dird/ua_label.c:1207 -msgid "" -" Slot | Volume Name | Status | Media Type | " -"Pool |\n" -msgstr "Ranura | Nombre Volumen | Estado | Tipo de Media | Pool |\n" - -#: src/dird/ua_label.c:1208 +#: src/dird/ua_label.c:1212 src/dird/ua_label.c:1214 src/dird/ua_label.c:1247 +#, fuzzy msgid "" -"------+------------------+-----------+----------------------" -"+--------------------|\n" +"+------+----------------------+-----------+-----------------" +"+--------------------+\n" msgstr "" "------+------------------+-----------+----------------------" "+--------------------|\n" +#: src/dird/ua_label.c:1213 +#, fuzzy +msgid "" +"| Slot | Volume Name | Status | Media Type | " +"Pool |\n" +msgstr "Ranura | Nombre Volumen | Estado | Tipo de Media | Pool |\n" + #: src/dird/ua_output.c:57 src/dird/ua_output.c:81 msgid "ON or OFF keyword missing.\n" msgstr "Faltan palabra clave ON u OFF.\n" @@ -7565,7 +7567,7 @@ msgstr "Nodo %s no tiene hijos.\n" msgid "%d total files; %d marked to be restored; %s bytes.\n" msgstr "%d total de los archivos; %d marcado para ser restaurado; %s bytes.\n" -#: src/dird/ua_tree.c:796 src/stored/btape.c:2961 +#: src/dird/ua_tree.c:796 src/stored/btape.c:2960 #, c-format msgid "" " Command Description\n" @@ -8624,27 +8626,27 @@ msgstr "Error de red al enviar para SD. ERR=%s\n" msgid "Compression deflateParams error: %d\n" msgstr "Error de compresión DeflateParams: %d\n" -#: src/filed/backup.c:1105 +#: src/filed/backup.c:1103 #, c-format msgid " Cannot open resource fork for \"%s\": ERR=%s.\n" msgstr "No se puede abrir recurso fork para \"%s\": ERR=%s.\n" -#: src/filed/backup.c:1163 +#: src/filed/backup.c:1161 #, c-format msgid "Compression deflate error: %d\n" msgstr "Error de compresión Deflate: %d\n" -#: src/filed/backup.c:1170 +#: src/filed/backup.c:1168 #, c-format msgid "Compression deflateReset error: %d\n" msgstr "Error de compresión DeflateReset: %d\n" -#: src/filed/backup.c:1212 +#: src/filed/backup.c:1210 #, fuzzy, c-format msgid "Compression LZO error: %d\n" msgstr "Error de compresión Deflate: %d\n" -#: src/filed/backup.c:1422 +#: src/filed/backup.c:1420 #, c-format msgid "VSS Writer (BackupComplete): %s\n" msgstr "VSS Writer (BackupComplete): %s\n" @@ -13439,7 +13441,7 @@ msgstr "No se puede establecer el tamaño del búfer de red.\n" msgid "NULL Volume name. This shouldn't happen!!!\n" msgstr "Nombre de volumen VACÍO. Esto no debería suceder!\n" -#: src/stored/append.c:123 src/stored/btape.c:2240 +#: src/stored/append.c:123 src/stored/btape.c:2239 #, c-format msgid "Write session label failed. ERR=%s\n" msgstr "Fallo al escribir la etiqueta de sesión. ERR=%s\n" @@ -13479,7 +13481,7 @@ msgstr "Error Fatal añadiendo en el dispositivo %s: ERR=%s\n" msgid "Set ok=FALSE after write_block_to_device.\n" msgstr "Set ok=FALSE después de write_block_to_device.\n" -#: src/stored/append.c:319 src/stored/btape.c:2359 +#: src/stored/append.c:319 src/stored/btape.c:2358 #, c-format msgid "Error writing end session label. ERR=%s\n" msgstr "Error escribiendo etiqueta de fin de sesión. ERR=%s\n" @@ -13501,7 +13503,7 @@ msgstr "" msgid "Error updating file attributes. ERR=%s\n" msgstr "Error al actualizar los atributos de archivo. ERR=%s\n" -#: src/stored/askdir.c:160 src/stored/btape.c:3045 +#: src/stored/askdir.c:160 src/stored/btape.c:3044 #, c-format msgid "Mount Volume \"%s\" on device %s and press return when ready: " msgstr "" @@ -13870,7 +13872,7 @@ msgid "Copy skipped. Record does not match BSR filter.\n" msgstr "Copia omitida. Registro no coincide con filtro de BSR.\n" #: src/stored/bcopy.c:270 src/stored/bcopy.c:278 src/stored/bcopy.c:306 -#: src/stored/btape.c:2768 +#: src/stored/btape.c:2767 #, c-format msgid "Cannot fixup device error. %s\n" msgstr "No se puede corregir error de dispositivo. %s\n" @@ -15074,7 +15076,7 @@ msgstr "" msgid "Do you want to continue? (y/n): " msgstr "Desea continuar? (y/n)" -#: src/stored/btape.c:751 src/stored/btape.c:2203 +#: src/stored/btape.c:751 src/stored/btape.c:2202 msgid "Command aborted.\n" msgstr "Comando Abortado.\n" @@ -15113,13 +15115,13 @@ msgstr "" #: src/stored/btape.c:813 src/stored/btape.c:824 src/stored/btape.c:835 #: src/stored/btape.c:1153 src/stored/btape.c:1169 src/stored/btape.c:1910 -#: src/stored/btape.c:2835 +#: src/stored/btape.c:2834 msgid "Error writing record to block.\n" msgstr "Error al escribir registro al bloque.\n" #: src/stored/btape.c:817 src/stored/btape.c:828 src/stored/btape.c:839 #: src/stored/btape.c:1157 src/stored/btape.c:1173 src/stored/btape.c:1914 -#: src/stored/btape.c:2839 +#: src/stored/btape.c:2838 msgid "Error writing block to device.\n" msgstr "Error al escribir bloque al dispositivo.\n" @@ -15206,7 +15208,7 @@ msgstr "" msgid "Begin writing %i files of %sB with raw blocks of %u bytes.\n" msgstr "Inicia escribiendo %i archivos de %sB con raw bloques de %u bytes.\n" -#: src/stored/btape.c:931 src/stored/btape.c:2891 +#: src/stored/btape.c:931 src/stored/btape.c:2890 #, c-format msgid "Write failed at block %u. stat=%d ERR=%s\n" msgstr "Error al escritura en el bloque %u. stat=%d ERR=%s\n" @@ -15930,7 +15932,7 @@ msgstr "Mala longitud introducida, utilizando 1024 bytes por defecto.\n" msgid "Read of %d bytes gives stat=%d. ERR=%s\n" msgstr "Lectura de %d bytes obtuvo stat=%d. ERR=%s\n" -#: src/stored/btape.c:1970 src/stored/btape.c:2019 +#: src/stored/btape.c:1970 src/stored/btape.c:2018 #, c-format msgid "End of tape\n" msgstr "Fin de la cinta\n" @@ -15950,39 +15952,39 @@ msgstr "error de lectura en %s. ERR=%s.\n" msgid "Bad status from read %d. ERR=%s\n" msgstr "Malo estado desde lectura %d. ERR=%s\n" -#: src/stored/btape.c:1985 src/stored/btape.c:1999 src/stored/btape.c:2063 -#: src/stored/btape.c:2075 src/stored/btape.c:2088 src/stored/btape.c:2104 +#: src/stored/btape.c:1985 src/stored/btape.c:1999 src/stored/btape.c:2062 +#: src/stored/btape.c:2074 src/stored/btape.c:2087 src/stored/btape.c:2103 #, c-format msgid "1 block of %d bytes in file %d\n" msgstr "1 bloque de %d bytes en el archivo %d\n" -#: src/stored/btape.c:1988 src/stored/btape.c:2002 src/stored/btape.c:2066 -#: src/stored/btape.c:2078 src/stored/btape.c:2091 src/stored/btape.c:2107 +#: src/stored/btape.c:1988 src/stored/btape.c:2002 src/stored/btape.c:2065 +#: src/stored/btape.c:2077 src/stored/btape.c:2090 src/stored/btape.c:2106 #, c-format msgid "%d blocks of %d bytes in file %d\n" msgstr "%d bloques de %d bytes en archivo %d\n" -#: src/stored/btape.c:2010 src/stored/btape.c:2082 +#: src/stored/btape.c:2010 src/stored/btape.c:2081 #, c-format msgid "End of File mark.\n" msgstr "Fin de la marca de archivo.\n" -#: src/stored/btape.c:2031 src/stored/btape.c:2135 +#: src/stored/btape.c:2030 src/stored/btape.c:2134 #, c-format msgid "Total files=%d, blocks=%d, bytes = %s\n" msgstr "Total de archivos=%d, bloques=%d, bytes = %s\n" -#: src/stored/btape.c:2095 +#: src/stored/btape.c:2094 #, c-format msgid "Short block read.\n" msgstr "Leer bloque corto.\n" -#: src/stored/btape.c:2098 +#: src/stored/btape.c:2097 #, c-format msgid "Error reading block. ERR=%s\n" msgstr "Error leyendo el bloque. ERR=%s\n" -#: src/stored/btape.c:2122 +#: src/stored/btape.c:2121 #, c-format msgid "" "Block=%u file,blk=%u,%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s " @@ -15991,12 +15993,12 @@ msgstr "" "Bloque=%u archivo,blk=%u,%u blen=%u Primero rec FI=%s SessId=%u SessTim=%u " "Strm=%s rlen=%d\n" -#: src/stored/btape.c:2144 +#: src/stored/btape.c:2143 #, c-format msgid "Device status: %u. ERR=%s\n" msgstr "Estado del dispositivo: %u. ERR=%s\n" -#: src/stored/btape.c:2176 +#: src/stored/btape.c:2175 #, c-format msgid "" "\n" @@ -16043,7 +16045,7 @@ msgstr "" "\n" "Esto puede tomar mucho tiempo - horas! ...\n" -#: src/stored/btape.c:2194 +#: src/stored/btape.c:2193 msgid "" "Do you want to run the simplified test (s) with one tape\n" "or the complete multiple tape (m) test: (s/m) " @@ -16051,73 +16053,73 @@ msgstr "" "¿Desea ejecutar la prueba simplificada (s) con una cinta\n" "o la prueba completa con múltiples (m) cintas?: (s/m)" -#: src/stored/btape.c:2197 +#: src/stored/btape.c:2196 msgid "Simple test (single tape) selected.\n" msgstr "Prueba simple (una sola cinta) seleccionada.\n" -#: src/stored/btape.c:2200 +#: src/stored/btape.c:2199 msgid "Multiple tape test selected.\n" msgstr "Múltiples cintas de prueba seleccionados.\n" -#: src/stored/btape.c:2244 +#: src/stored/btape.c:2243 msgid "Wrote Start of Session label.\n" msgstr "Escribe la etiqueta de Inicio de Sesión.\n" -#: src/stored/btape.c:2263 +#: src/stored/btape.c:2262 #, c-format msgid "%s Begin writing Bacula records to tape ...\n" msgstr "%s Empezar a escribir registros Bacula en cinta ...\n" -#: src/stored/btape.c:2265 +#: src/stored/btape.c:2264 #, c-format msgid "%s Begin writing Bacula records to first tape ...\n" msgstr "%s Empezar a escribir registros Bacula en la primera cinta ...\n" -#: src/stored/btape.c:2291 +#: src/stored/btape.c:2290 msgid "Flush block failed.\n" msgstr "Fallo Flush bloque.\n" -#: src/stored/btape.c:2305 +#: src/stored/btape.c:2304 #, c-format msgid "Wrote block=%u, file,blk=%u,%u VolBytes=%s rate=%sB/s\n" msgstr "Escribió bloque=%u, archivo,blk=%u,%u VolBytes=%s tasa=%sB/s\n" -#: src/stored/btape.c:2316 +#: src/stored/btape.c:2315 #, c-format msgid "%s Flush block, write EOF\n" msgstr "%s Flush bloque, escribir EOF\n" -#: src/stored/btape.c:2325 +#: src/stored/btape.c:2324 msgid "Wrote 1000 blocks on second tape. Done.\n" msgstr "Escribió 1000 bloques en segunda cinta. Hecho.\n" -#: src/stored/btape.c:2330 +#: src/stored/btape.c:2329 msgid "Not OK\n" msgstr "No OK\n" -#: src/stored/btape.c:2354 +#: src/stored/btape.c:2353 msgid "Job canceled.\n" msgstr "Job cancelado.\n" -#: src/stored/btape.c:2365 +#: src/stored/btape.c:2364 msgid "Set ok=false after write_block_to_device.\n" msgstr "Establecer ok=false después de write_block_to_device.\n" -#: src/stored/btape.c:2369 +#: src/stored/btape.c:2368 msgid "Wrote End of Session label.\n" msgstr "Escribió etiqueta de Fin de Sesión.\n" -#: src/stored/btape.c:2392 +#: src/stored/btape.c:2391 #, c-format msgid "Wrote state file last_block_num1=%d last_block_num2=%d\n" msgstr "Escribió archivo de estado last_block_num1=%d last_block_num2=%d\n" -#: src/stored/btape.c:2396 +#: src/stored/btape.c:2395 #, c-format msgid "Could not create state file: %s ERR=%s\n" msgstr "No se puede crear archivo de estado: %s ERR=%s\n" -#: src/stored/btape.c:2407 +#: src/stored/btape.c:2406 #, c-format msgid "" "\n" @@ -16128,7 +16130,7 @@ msgstr "" "\n" "%s Hecho llenado de cinta en %d:%d. Ahora empezando a releer la cinta ...\n" -#: src/stored/btape.c:2410 +#: src/stored/btape.c:2409 #, c-format msgid "" "\n" @@ -16140,16 +16142,16 @@ msgstr "" "%s Hecho llenado de cintas en %d:%d. Ahora empezando a releer la primera " "cinta ...\n" -#: src/stored/btape.c:2416 +#: src/stored/btape.c:2415 msgid "do_unfill failed.\n" msgstr "do_unfill fallido.\n" -#: src/stored/btape.c:2421 +#: src/stored/btape.c:2420 #, c-format msgid "%s: Error during test.\n" msgstr "%s: Error durante la prueba.\n" -#: src/stored/btape.c:2456 +#: src/stored/btape.c:2455 msgid "" "\n" "The state file level has changed. You must redo\n" @@ -16159,7 +16161,7 @@ msgstr "" "El estado del archivo de nivel de ha cambiado. Usted debe rehacer\n" "el comando llenar.\n" -#: src/stored/btape.c:2463 +#: src/stored/btape.c:2462 #, c-format msgid "" "\n" @@ -16170,40 +16172,40 @@ msgstr "" "No se pudo encontrar el archivo de estado: %s ERR=%s\n" "Usted debe rehacer el comando llenar.\n" -#: src/stored/btape.c:2529 +#: src/stored/btape.c:2528 msgid "Mount first tape. Press enter when ready: " msgstr "Monte primera cinta. Cuando esté listo, presione ENTER:" -#: src/stored/btape.c:2546 +#: src/stored/btape.c:2545 msgid "Rewinding.\n" msgstr "Rebobinado.\n" -#: src/stored/btape.c:2551 +#: src/stored/btape.c:2550 #, c-format msgid "Reading the first 10000 records from %u:%u.\n" msgstr "Leyendo los primeros 10.000 registros desde %u:%u.\n" -#: src/stored/btape.c:2555 src/stored/btape.c:2627 +#: src/stored/btape.c:2554 src/stored/btape.c:2626 #, c-format msgid "Reposition from %u:%u to %u:%u\n" msgstr "Reposición desde %u:%u para %u:%u\n" -#: src/stored/btape.c:2560 src/stored/btape.c:2614 src/stored/btape.c:2632 +#: src/stored/btape.c:2559 src/stored/btape.c:2613 src/stored/btape.c:2631 #, c-format msgid "Reposition error. ERR=%s\n" msgstr "Error de reposición. ERR=%s\n" -#: src/stored/btape.c:2563 +#: src/stored/btape.c:2562 #, c-format msgid "Reading block %u.\n" msgstr "Leyendo bloque %u.\n" -#: src/stored/btape.c:2565 src/stored/btape.c:2619 src/stored/btape.c:2637 +#: src/stored/btape.c:2564 src/stored/btape.c:2618 src/stored/btape.c:2636 #, c-format msgid "Error reading block: ERR=%s\n" msgstr "Error leyendo bloque: ERR=%s.\n" -#: src/stored/btape.c:2570 +#: src/stored/btape.c:2569 msgid "" "\n" "The last block on the tape matches. Test succeeded.\n" @@ -16213,7 +16215,7 @@ msgstr "" "El último bloque de la cinta concuerdan. Prueba Satisfactoria.\n" "\n" -#: src/stored/btape.c:2573 +#: src/stored/btape.c:2572 msgid "" "\n" "The last block of the first tape matches.\n" @@ -16223,21 +16225,21 @@ msgstr "" "El último bloque de la primera cinta concuerdan.\n" "\n" -#: src/stored/btape.c:2597 +#: src/stored/btape.c:2596 msgid "Mount second tape. Press enter when ready: " msgstr "Monte la segunda cinta. Cuando esté listo, presione ENTER:" -#: src/stored/btape.c:2611 +#: src/stored/btape.c:2610 #, c-format msgid "Reposition from %u:%u to 0:1\n" msgstr "Reposición desde %u:%u para 0:1\n" -#: src/stored/btape.c:2617 src/stored/btape.c:2635 +#: src/stored/btape.c:2616 src/stored/btape.c:2634 #, c-format msgid "Reading block %d.\n" msgstr "Leyendo bloque %d.\n" -#: src/stored/btape.c:2623 +#: src/stored/btape.c:2622 msgid "" "\n" "The first block on the second tape matches.\n" @@ -16247,7 +16249,7 @@ msgstr "" "El primer bloque de la segunda cinta concuerdan.\n" "\n" -#: src/stored/btape.c:2641 +#: src/stored/btape.c:2640 msgid "" "\n" "The last block on the second tape matches. Test succeeded.\n" @@ -16257,20 +16259,20 @@ msgstr "" "El último bloque de la segunda cinta concuerdan. Prueba Satisfactoria.\n" "\n" -#: src/stored/btape.c:2659 +#: src/stored/btape.c:2658 #, c-format msgid "10000 records read now at %d:%d\n" msgstr "Leer 10000 registros ahora desde %d:%d\n" -#: src/stored/btape.c:2685 src/stored/btape.c:2696 src/stored/btape.c:2741 +#: src/stored/btape.c:2684 src/stored/btape.c:2695 src/stored/btape.c:2740 msgid "Last block written" msgstr "Ultimo bloque escrito" -#: src/stored/btape.c:2687 src/stored/btape.c:2697 +#: src/stored/btape.c:2686 src/stored/btape.c:2696 msgid "Block read back" msgstr "Bloque que leer" -#: src/stored/btape.c:2688 +#: src/stored/btape.c:2687 #, c-format msgid "" "\n" @@ -16281,7 +16283,7 @@ msgstr "" "\n" "Los bloques difieren en %u byte\n" -#: src/stored/btape.c:2689 +#: src/stored/btape.c:2688 msgid "" "\n" "\n" @@ -16297,129 +16299,129 @@ msgstr "" "Esto debe ser corregido antes de utilizar Bacula\n" "para escribir volúmenes multi-cinta !!!!\n" -#: src/stored/btape.c:2725 +#: src/stored/btape.c:2724 #, c-format msgid "Last block at: %u:%u this_dev_block_num=%d\n" msgstr "Último bloque en: %u:%u this_dev_block_num=%d\n" -#: src/stored/btape.c:2739 +#: src/stored/btape.c:2738 #, c-format msgid "Block not written: FileIndex=%u blk_block=%u Size=%u\n" msgstr "Bloque no está escrito: FileIndex=%u blk_block=%u Tamaño=%u\n" -#: src/stored/btape.c:2743 +#: src/stored/btape.c:2742 msgid "Block not written" msgstr "Bloque no escrito" -#: src/stored/btape.c:2758 +#: src/stored/btape.c:2757 #, c-format msgid "End of tape %d:%d. Volume Bytes=%s. Write rate = %sB/s\n" msgstr "" "Fin de la cinta %d:%d. Volumen Bytes=%s. Velocidad de Escritura = %sB/s\n" -#: src/stored/btape.c:2809 +#: src/stored/btape.c:2808 msgid "Test writing blocks of 64512 bytes to tape.\n" msgstr "Prueba de escritura de bloques de 64512 bytes a cinta.\n" -#: src/stored/btape.c:2811 +#: src/stored/btape.c:2810 msgid "How many blocks do you want to write? (1000): " msgstr "¿Cuántos bloques usted quiere escribir? (1000):" -#: src/stored/btape.c:2828 +#: src/stored/btape.c:2827 #, c-format msgid "Begin writing %d Bacula blocks to tape ...\n" msgstr "Empezando a escribir %d bloques Bacula en la cinta ...\n" -#: src/stored/btape.c:2871 +#: src/stored/btape.c:2870 #, c-format msgid "Begin writing raw blocks of %u bytes.\n" msgstr "Empezando a escribir bloques raw de %u bytes.\n" -#: src/stored/btape.c:2902 +#: src/stored/btape.c:2901 msgid "test autochanger" msgstr "prueba Autochanger" -#: src/stored/btape.c:2903 +#: src/stored/btape.c:2902 msgid "backspace file" msgstr "archivo de retroceso" -#: src/stored/btape.c:2904 +#: src/stored/btape.c:2903 msgid "backspace record" msgstr "registro de retroceso" -#: src/stored/btape.c:2905 +#: src/stored/btape.c:2904 msgid "list device capabilities" msgstr "lista de las capacidades del dispositivo" -#: src/stored/btape.c:2906 +#: src/stored/btape.c:2905 msgid "clear tape errors" msgstr "Errores Cinta de Limpieza" -#: src/stored/btape.c:2907 +#: src/stored/btape.c:2906 msgid "go to end of Bacula data for append" msgstr "ir al final de los datos de Bacula para añadir" -#: src/stored/btape.c:2908 +#: src/stored/btape.c:2907 msgid "go to the physical end of medium" msgstr "ir al final del medio físico" -#: src/stored/btape.c:2909 +#: src/stored/btape.c:2908 msgid "fill tape, write onto second volume" msgstr "llenar cinta, escribir en segundo volumen" -#: src/stored/btape.c:2910 +#: src/stored/btape.c:2909 msgid "read filled tape" msgstr "leer cinta llena" -#: src/stored/btape.c:2911 +#: src/stored/btape.c:2910 msgid "forward space a file" msgstr "espaciar un archivo hacia adelante" -#: src/stored/btape.c:2912 +#: src/stored/btape.c:2911 msgid "forward space a record" msgstr "espaciar un registro hacia adelante" -#: src/stored/btape.c:2913 +#: src/stored/btape.c:2912 msgid "print this command" msgstr "imprimir este comando" -#: src/stored/btape.c:2914 +#: src/stored/btape.c:2913 msgid "write a Bacula label to the tape" msgstr "escribir una etiqueta Bacula en la cinta" -#: src/stored/btape.c:2915 +#: src/stored/btape.c:2914 msgid "load a tape" msgstr "cargar una cinta" -#: src/stored/btape.c:2916 +#: src/stored/btape.c:2915 msgid "quit btape" msgstr "salir btape" -#: src/stored/btape.c:2917 +#: src/stored/btape.c:2916 msgid "use write() to fill tape" msgstr "usar write() para llenar la cinta" -#: src/stored/btape.c:2918 +#: src/stored/btape.c:2917 msgid "read and print the Bacula tape label" msgstr "leer e imprimir la etiqueta Bacula de la cinta" -#: src/stored/btape.c:2919 +#: src/stored/btape.c:2918 msgid "test record handling functions" msgstr "prueba de manejo de registro de funciones" -#: src/stored/btape.c:2920 +#: src/stored/btape.c:2919 msgid "rewind the tape" msgstr "rebobinar la cinta" -#: src/stored/btape.c:2921 +#: src/stored/btape.c:2920 msgid "read() tape block by block to EOT and report" msgstr "leer() cinta bloque por bloque para EOT y reportar" -#: src/stored/btape.c:2922 +#: src/stored/btape.c:2921 msgid "Bacula read block by block to EOT and report" msgstr "Bacula leer bloque por bloque para EOT y reportar" -#: src/stored/btape.c:2923 +#: src/stored/btape.c:2922 msgid "" "[file_size=n(GB)|nb_file=3|skip_zero|skip_random|skip_raw|skip_block] report " "drive speed" @@ -16427,45 +16429,45 @@ msgstr "" "[file_size=n(GB)|nb_file=3|skip_zero|skip_random|skip_raw|skip_block] " "informe de velocidad de la unidad" -#: src/stored/btape.c:2924 +#: src/stored/btape.c:2923 msgid "print tape status" msgstr "imprimir estado de la cinta" -#: src/stored/btape.c:2925 +#: src/stored/btape.c:2924 msgid "General test Bacula tape functions" msgstr "Prueba general de las funciones de cinta Bacula" -#: src/stored/btape.c:2926 +#: src/stored/btape.c:2925 msgid "write an EOF on the tape" msgstr "escribir un EOF en la cinta" -#: src/stored/btape.c:2927 +#: src/stored/btape.c:2926 msgid "write a single Bacula block" msgstr "escribir un único bloque de Bacula" -#: src/stored/btape.c:2928 +#: src/stored/btape.c:2927 msgid "read a single record" msgstr "leer un solo registro" -#: src/stored/btape.c:2929 +#: src/stored/btape.c:2928 msgid "read a single Bacula block" msgstr "leer un único bloque de Bacula" -#: src/stored/btape.c:2930 +#: src/stored/btape.c:2929 msgid "quick fill command" msgstr "comando de llenado rápido" -#: src/stored/btape.c:2951 +#: src/stored/btape.c:2950 #, c-format msgid "\"%s\" is an invalid command\n" msgstr "\"%s\" es un comando inválido\n" -#: src/stored/btape.c:2960 +#: src/stored/btape.c:2959 #, c-format msgid "Interactive commands:\n" msgstr "Comandos interactivos:\n" -#: src/stored/btape.c:2971 +#: src/stored/btape.c:2970 #, fuzzy, c-format msgid "" "\n" @@ -16497,31 +16499,31 @@ msgstr "" " -? imprime esta mensaje.\n" "\n" -#: src/stored/btape.c:3042 +#: src/stored/btape.c:3041 #, c-format msgid "Mount second Volume on device %s and press return when ready: " msgstr "" "Monte el segundo volumen en el dispositivo %s y pulse ENTER cuando esté " "listo:" -#: src/stored/btape.c:3070 +#: src/stored/btape.c:3069 #, c-format msgid "Mount blank Volume on device %s and press return when ready: " msgstr "" "Monte un volumen en blanco en el dispositivo %s y pulse ENTER cuando esté " "listo:" -#: src/stored/btape.c:3090 +#: src/stored/btape.c:3089 #, c-format msgid "End of Volume \"%s\" %d records.\n" msgstr "Fin del Volumen \"%s\" %d registros.\n" -#: src/stored/btape.c:3104 +#: src/stored/btape.c:3103 #, c-format msgid "Read block=%u, VolBytes=%s rate=%sB/s\n" msgstr "Leer bloque=%u, VolBytes=%s velocidad=%sB/s\n" -#: src/stored/btape.c:3117 +#: src/stored/btape.c:3116 #, c-format msgid "Cannot open Dev=%s, Vol=%s\n" msgstr "No se puede abrir Dev=%s, Vol=%s\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Bacula 1.38\n" "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-06-30 08:32+0200\n" +"POT-Creation-Date: 2017-07-23 18:30+0200\n" "PO-Revision-Date: 2009-10-18 14:04+0000\n" "Last-Translator: Eric Bollengier <eric@eb.homelinux.org>\n" "Language-Team: French <bacula-devel-fr@lists.sourceforge.net>\n" @@ -40,8 +40,8 @@ msgstr "" msgid "*None*" msgstr "" -#: src/cats/cats.c:137 src/cats/mysql.c:487 src/cats/postgresql.c:583 -#: src/cats/postgresql.c:634 src/cats/sqlite.c:488 +#: src/cats/cats.c:137 src/cats/mysql.c:488 src/cats/postgresql.c:606 +#: src/cats/postgresql.c:657 src/cats/sqlite.c:488 #, fuzzy, c-format msgid "Query failed: %s: ERR=%s\n" msgstr "Erreur sur la requête : %s\n" @@ -54,12 +54,12 @@ msgstr "" msgid "A user name for MySQL must be supplied.\n" msgstr "Un nom d'utilisateur MySQL doit être fourni.\n" -#: src/cats/mysql.c:210 src/cats/postgresql.c:247 src/cats/sqlite.c:184 +#: src/cats/mysql.c:211 src/cats/postgresql.c:256 src/cats/sqlite.c:184 #, c-format msgid "Unable to initialize DB lock. ERR=%s\n" msgstr "Impossible d'initialiser le verrou sur la base. ERR=%s\n" -#: src/cats/mysql.c:267 +#: src/cats/mysql.c:268 #, c-format msgid "" "Unable to connect to MySQL server.\n" @@ -71,17 +71,17 @@ msgstr "" "Base=%s Utilisateur=%s\n" "Le serveur n'est pas démarré ou bien votre password est invalide.\n" -#: src/cats/mysql.c:463 src/cats/postgresql.c:529 src/cats/sqlite.c:411 +#: src/cats/mysql.c:464 src/cats/postgresql.c:552 src/cats/sqlite.c:411 #: src/dird/fd_cmds.c:960 src/dird/fd_cmds.c:1021 #, fuzzy, c-format msgid "Attribute create error. %s" msgstr "Erreur sur l'autochangeur : ERR=%s\n" -#: src/cats/postgresql.c:110 +#: src/cats/postgresql.c:119 msgid "A user name for PostgreSQL must be supplied.\n" msgstr "Un nom d'utilisateur PostgreSQL doit être fourni.\n" -#: src/cats/postgresql.c:205 src/cats/sql.c:531 src/cats/sql.c:538 +#: src/cats/postgresql.c:214 src/cats/sql.c:531 src/cats/sql.c:538 #: src/cats/sql_create.c:559 src/cats/sql_get.c:191 src/cats/sql_get.c:242 #: src/cats/sql_get.c:613 src/cats/sql_get.c:824 src/cats/sql_get.c:1152 #: src/cats/sql_get.c:1543 src/cats/sql_get.c:1695 @@ -89,12 +89,12 @@ msgstr "Un nom d'utilisateur PostgreSQL doit être fourni.\n" msgid "error fetching row: %s\n" msgstr "erreur en terminant le mode batch: %s\n" -#: src/cats/postgresql.c:217 +#: src/cats/postgresql.c:226 #, c-format msgid "Encoding error for database \"%s\". Wanted SQL_ASCII, got %s\n" msgstr "" -#: src/cats/postgresql.c:307 +#: src/cats/postgresql.c:330 #, fuzzy, c-format msgid "" "Unable to connect to PostgreSQL server. Database=%s User=%s\n" @@ -105,39 +105,39 @@ msgstr "" "Base=%s Utilisateur=%s\n" "Le serveur n'est pas démarré ou bien votre password est invalide.\n" -#: src/cats/postgresql.c:423 +#: src/cats/postgresql.c:446 msgid "PQescapeStringConn returned non-zero.\n" msgstr "" -#: src/cats/postgresql.c:443 +#: src/cats/postgresql.c:466 msgid "PQescapeByteaConn returned NULL.\n" msgstr "" -#: src/cats/postgresql.c:472 +#: src/cats/postgresql.c:495 msgid "PQunescapeByteaConn returned NULL.\n" msgstr "" -#: src/cats/postgresql.c:590 +#: src/cats/postgresql.c:613 #, fuzzy, c-format msgid "Fetch failed: ERR=%s\n" msgstr "Erreur sur l'ouverture du périphérique. ERR=%s\n" -#: src/cats/postgresql.c:883 +#: src/cats/postgresql.c:906 #, fuzzy, c-format msgid "error fetching currval: %s\n" msgstr "Impossible d'ouvrir le fichier de données %s.\n" -#: src/cats/postgresql.c:1064 +#: src/cats/postgresql.c:1087 #, fuzzy, c-format msgid "error starting batch mode: %s" msgstr "erreur en terminant le mode batch: %s\n" -#: src/cats/postgresql.c:1094 src/cats/postgresql.c:1101 +#: src/cats/postgresql.c:1117 src/cats/postgresql.c:1124 #, fuzzy, c-format msgid "error ending batch mode: %s" msgstr "erreur en terminant le mode batch: %s\n" -#: src/cats/postgresql.c:1151 +#: src/cats/postgresql.c:1174 #, fuzzy, c-format msgid "error copying in batch mode: %s" msgstr "erreur en terminant le mode batch: %s\n" @@ -744,7 +744,7 @@ msgstr "Merci de corriger le fichier de configuration : %s\n" #: src/console/bbconsjson.c:432 src/console/bbconsjson.c:463 #: src/console/console.c:1422 src/console/console.c:1452 -#: src/dird/bdirjson.c:1184 src/dird/bdirjson.c:1222 src/dird/bdirjson.c:1277 +#: src/dird/bdirjson.c:1185 src/dird/bdirjson.c:1223 src/dird/bdirjson.c:1278 #: src/dird/dird.c:778 src/dird/dird.c:996 src/dird/dird.c:1051 #: src/dird/dird.c:1254 src/filed/bfdjson.c:484 src/filed/bfdjson.c:527 #: src/filed/bfdjson.c:562 src/filed/filed.c:390 src/filed/filed.c:590 @@ -1437,7 +1437,7 @@ msgstr "" " -? affiche ce message.\n" "\n" -#: src/dird/bdirjson.c:1162 src/dird/dird.c:756 +#: src/dird/bdirjson.c:1163 src/dird/dird.c:756 #, fuzzy, c-format msgid "" "No Director resource defined in %s\n" @@ -1446,30 +1446,30 @@ 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/dird/bdirjson.c:1170 src/dird/dird.c:764 src/filed/bfdjson.c:477 +#: src/dird/bdirjson.c:1171 src/dird/dird.c:764 src/filed/bfdjson.c:477 #: src/filed/filed.c:352 #, fuzzy, c-format msgid "No Messages resource defined in %s\n" msgstr "Pas d'enregistrement trouvé en base pour : %s\n" -#: src/dird/bdirjson.c:1175 src/dird/dird.c:769 +#: src/dird/bdirjson.c:1176 src/dird/dird.c:769 #, fuzzy, c-format msgid "Only one Director resource permitted in %s\n" msgstr "Impossible de trouver la ressource Director \"%s\"\n" -#: src/dird/bdirjson.c:1192 src/dird/dird.c:786 src/filed/bfdjson.c:537 +#: src/dird/bdirjson.c:1193 src/dird/dird.c:786 src/filed/bfdjson.c:537 #: src/filed/filed.c:600 src/stored/bsdjson.c:607 src/stored/stored.c:447 #, c-format msgid "\"TLS Certificate\" file not defined for Director \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1198 src/dird/dird.c:792 src/filed/bfdjson.c:543 +#: src/dird/bdirjson.c:1199 src/dird/dird.c:792 src/filed/bfdjson.c:543 #: src/filed/filed.c:606 src/stored/bsdjson.c:613 src/stored/stored.c:453 #, c-format msgid "\"TLS Key\" file not defined for Director \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1205 src/dird/dird.c:799 src/filed/bfdjson.c:549 +#: src/dird/bdirjson.c:1206 src/dird/dird.c:799 src/filed/bfdjson.c:549 #: src/filed/filed.c:612 src/stored/bsdjson.c:619 src/stored/stored.c:459 #, c-format msgid "" @@ -1478,19 +1478,19 @@ msgid "" "using \"TLS Verify Peer\".\n" msgstr "" -#: src/dird/bdirjson.c:1231 src/dird/dird.c:1005 src/filed/bfdjson.c:572 +#: src/dird/bdirjson.c:1232 src/dird/dird.c:1005 src/filed/bfdjson.c:572 #: src/filed/filed.c:653 #, c-format msgid "\"TLS Certificate\" file not defined for Console \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1237 src/dird/dird.c:1011 src/filed/bfdjson.c:578 +#: src/dird/bdirjson.c:1238 src/dird/dird.c:1011 src/filed/bfdjson.c:578 #: src/filed/filed.c:659 #, c-format msgid "\"TLS Key\" file not defined for Console \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1244 src/dird/dird.c:1018 src/filed/bfdjson.c:584 +#: src/dird/bdirjson.c:1245 src/dird/dird.c:1018 src/filed/bfdjson.c:584 #: src/filed/filed.c:665 #, c-format msgid "" @@ -1499,41 +1499,41 @@ msgid "" "using \"TLS Verify Peer\".\n" msgstr "" -#: src/dird/bdirjson.c:1261 src/dird/dird.c:1035 src/dird/dird.c:1075 +#: src/dird/bdirjson.c:1262 src/dird/dird.c:1035 src/dird/dird.c:1075 #: src/filed/filed.c:415 #, fuzzy, c-format msgid "Failed to initialize TLS context for File daemon \"%s\" in %s.\n" msgstr "Impossible d'initialiser le contexte TLS pour le Director \"%s\".\n" -#: src/dird/bdirjson.c:1284 src/dird/dird.c:1058 +#: src/dird/bdirjson.c:1285 src/dird/dird.c:1058 #, c-format msgid "" "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for " "File daemon \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1293 src/dird/dird.c:826 +#: src/dird/bdirjson.c:1294 src/dird/dird.c:826 #, fuzzy, c-format msgid "No Job records defined in %s\n" msgstr "Pas d'enregistrement trouvé en base pour : %s\n" -#: src/dird/bdirjson.c:1353 src/dird/bdirjson.c:1366 src/dird/dird.c:877 +#: src/dird/bdirjson.c:1354 src/dird/bdirjson.c:1367 src/dird/dird.c:877 #: src/dird/dird.c:890 #, c-format msgid "Hey something is wrong. p=0x%lu\n" msgstr "" -#: src/dird/bdirjson.c:1452 src/dird/dird.c:960 +#: src/dird/bdirjson.c:1453 src/dird/dird.c:960 #, c-format msgid "\"%s\" directive in Job \"%s\" resource is required, but not found.\n" msgstr "" -#: src/dird/bdirjson.c:1459 src/dird/dird.c:967 +#: src/dird/bdirjson.c:1460 src/dird/dird.c:967 #, fuzzy msgid "Too many items in Job resource\n" msgstr "Trop d'élément dans la ressource %s\n" -#: src/dird/bdirjson.c:1463 src/dird/dird.c:971 +#: src/dird/bdirjson.c:1464 src/dird/dird.c:971 #, c-format msgid "No storage specified in Job \"%s\" nor in Pool.\n" msgstr "Pas de Storage spécifié dans le job \"%s\" ni dans le Pool.\n" @@ -4159,11 +4159,11 @@ msgstr "Entrez le nom du Volume : " msgid "Enter base volume name: " msgstr "Entrez le nom de base du volume : " -#: src/dird/ua_cmds.c:368 src/dird/ua_label.c:652 +#: src/dird/ua_cmds.c:368 src/dird/ua_label.c:654 msgid "Volume name too long.\n" msgstr "Nom de Volume trop long.\n" -#: src/dird/ua_cmds.c:372 src/dird/ua_label.c:658 src/lib/edit.c:519 +#: src/dird/ua_cmds.c:372 src/dird/ua_label.c:660 src/lib/edit.c:519 msgid "Volume name must be at least one character long.\n" msgstr "Le nom du volume doit comporter au moins un caractère\n" @@ -4802,13 +4802,13 @@ msgstr "Les valeurs doivent être supérieurs à zéro.\n" msgid "Slot too large.\n" msgstr "Slot trop grand.\n" -#: src/dird/ua_label.c:178 src/dird/ua_label.c:356 src/dird/ua_label.c:1185 +#: src/dird/ua_label.c:178 src/dird/ua_label.c:356 src/dird/ua_label.c:1190 #: src/dird/ua_run.c:473 src/dird/ua_run.c:1356 src/dird/ua_run.c:1361 #, fuzzy msgid "Command input" msgstr "Erreur sur la commande : %s\n" -#: src/dird/ua_label.c:196 src/dird/ua_label.c:520 src/dird/ua_label.c:1192 +#: src/dird/ua_label.c:196 src/dird/ua_label.c:520 src/dird/ua_label.c:1197 msgid "No slots in changer to scan.\n" msgstr "Pas de slot dans le magasin à scanner.\n" @@ -4816,7 +4816,7 @@ msgstr "Pas de slot dans le magasin à scanner.\n" msgid "No Volumes found to label, or no barcodes.\n" msgstr "Pas de volume à labéliser ou pas de codebar.\n" -#: src/dird/ua_label.c:218 src/dird/ua_label.c:1213 +#: src/dird/ua_label.c:218 src/dird/ua_label.c:1219 #, c-format msgid "Slot %d greater than max %d ignored.\n" msgstr "Le slot %d est ignoré car il est supérieur au maximum %d.\n" @@ -4927,70 +4927,70 @@ msgstr "Le volume \"%s\" est à jour dans le catalogue.\n" msgid "Catalog error on cleaning tape: %s" msgstr "Impossible d'ouvrir le fichier de données %s.\n" -#: src/dird/ua_label.c:645 +#: src/dird/ua_label.c:647 #, c-format msgid "Illegal character \"%c\" in a volume name.\n" msgstr "Caractères \"%c\" interdits dans le nom d'un volume.\n" -#: src/dird/ua_label.c:693 +#: src/dird/ua_label.c:695 #, c-format msgid "Sending relabel command from \"%s\" to \"%s\" ...\n" msgstr "Envoie de la commande pour re-labéliser de \"%s\" à \"%s\"...\n" -#: src/dird/ua_label.c:700 +#: src/dird/ua_label.c:702 #, c-format msgid "Sending label command for Volume \"%s\" Slot %d ...\n" msgstr "Demande de labélisation du volume \"%s\" Slot %d...\n" -#: src/dird/ua_label.c:730 +#: src/dird/ua_label.c:732 #, fuzzy, c-format msgid "Catalog record for Volume \"%s\", Slot %d successfully created.\n" msgstr "Le volume \"%s\" est à jour dans le catalogue.\n" -#: src/dird/ua_label.c:745 +#: src/dird/ua_label.c:747 #, c-format msgid "Label command failed for Volume %s.\n" msgstr "Impossible de labéliser le volume %s.\n" -#: src/dird/ua_label.c:759 +#: src/dird/ua_label.c:761 msgid "Could not open SD socket.\n" msgstr "Impossible d'ouvrir la socket avec le SD.\n" -#: src/dird/ua_label.c:831 src/dird/ua_label.c:841 +#: src/dird/ua_label.c:833 src/dird/ua_label.c:843 #, c-format msgid "Invalid Slot number: %s\n" msgstr "Numéro de slot invalide : %s\n" -#: src/dird/ua_label.c:850 +#: src/dird/ua_label.c:852 #, fuzzy, c-format msgid "Invalid Volume name: %s. Volume skipped.\n" msgstr "Nom de Volume invalide : %s\n" -#: src/dird/ua_label.c:944 +#: src/dird/ua_label.c:946 #, c-format msgid "Device \"%s\" has %d slots.\n" msgstr "Le Device \"%s\" a %d slots.\n" -#: src/dird/ua_label.c:990 +#: src/dird/ua_label.c:995 #, c-format msgid "Pool \"%s\" resource not found for volume \"%s\"!\n" msgstr "La ressource Pool \"%s\" est introuvable pour le volume \"%s\"\n" -#: src/dird/ua_label.c:1204 +#: src/dird/ua_label.c:1209 #, fuzzy msgid "No Volumes found, or no barcodes.\n" msgstr "Pas de volume à labéliser ou pas de codebar.\n" -#: src/dird/ua_label.c:1207 +#: src/dird/ua_label.c:1212 src/dird/ua_label.c:1214 src/dird/ua_label.c:1247 msgid "" -" Slot | Volume Name | Status | Media Type | " -"Pool |\n" +"+------+----------------------+-----------+-----------------" +"+--------------------+\n" msgstr "" -#: src/dird/ua_label.c:1208 +#: src/dird/ua_label.c:1213 msgid "" -"------+------------------+-----------+----------------------" -"+--------------------|\n" +"| Slot | Volume Name | Status | Media Type | " +"Pool |\n" msgstr "" #: src/dird/ua_output.c:57 src/dird/ua_output.c:81 @@ -7562,7 +7562,7 @@ msgstr "Le noeud %s n'a pas de fils.\n" msgid "%d total files; %d marked to be restored; %s bytes.\n" msgstr "%d fichiers en tout ; %d marqués pour la restauration ; %s octets.\n" -#: src/dird/ua_tree.c:796 src/stored/btape.c:2961 +#: src/dird/ua_tree.c:796 src/stored/btape.c:2960 #, c-format msgid "" " Command Description\n" @@ -8632,27 +8632,27 @@ msgstr "Erreur dans l'exécution de la commande : %s. ERR=%s\n" msgid "Compression deflateParams error: %d\n" msgstr "Erreur de décompression. ERR=%d\n" -#: src/filed/backup.c:1105 +#: src/filed/backup.c:1103 #, fuzzy, c-format msgid " Cannot open resource fork for \"%s\": ERR=%s.\n" msgstr "Impossible d'ouvrir le fichier %s : ERR=%s\n" -#: src/filed/backup.c:1163 +#: src/filed/backup.c:1161 #, fuzzy, c-format msgid "Compression deflate error: %d\n" msgstr "Erreur de décompression. ERR=%d\n" -#: src/filed/backup.c:1170 +#: src/filed/backup.c:1168 #, fuzzy, c-format msgid "Compression deflateReset error: %d\n" msgstr "Erreur de décompression. ERR=%d\n" -#: src/filed/backup.c:1212 +#: src/filed/backup.c:1210 #, fuzzy, c-format msgid "Compression LZO error: %d\n" msgstr "Erreur de décompression. ERR=%d\n" -#: src/filed/backup.c:1422 +#: src/filed/backup.c:1420 #, c-format msgid "VSS Writer (BackupComplete): %s\n" msgstr "" @@ -13388,7 +13388,7 @@ msgstr "Impossible de récupérer le Job du JobId=%s : ERR=%s\n" msgid "NULL Volume name. This shouldn't happen!!!\n" msgstr "" -#: src/stored/append.c:123 src/stored/btape.c:2240 +#: src/stored/append.c:123 src/stored/btape.c:2239 #, c-format msgid "Write session label failed. ERR=%s\n" msgstr "Impossible d'écrire le label de session. ERR=%s\n" @@ -13430,7 +13430,7 @@ msgstr "Erreur de lecture de %s:%s:%d : ERR=%s\n" msgid "Set ok=FALSE after write_block_to_device.\n" msgstr "Erreur pendant l'écriture du fichier bsr.\n" -#: src/stored/append.c:319 src/stored/btape.c:2359 +#: src/stored/append.c:319 src/stored/btape.c:2358 #, fuzzy, c-format msgid "Error writing end session label. ERR=%s\n" msgstr "" @@ -13452,7 +13452,7 @@ msgid "Error updating file attributes. ERR=%s\n" msgstr "" "Erreur pendant l'écriture des données vers le fichier de spool. ERR=%s\n" -#: src/stored/askdir.c:160 src/stored/btape.c:3045 +#: src/stored/askdir.c:160 src/stored/btape.c:3044 #, fuzzy, c-format msgid "Mount Volume \"%s\" on device %s and press return when ready: " msgstr "Chargez une deuxième bande et appuyez sur \"Entrée\" : " @@ -13812,7 +13812,7 @@ msgid "Copy skipped. Record does not match BSR filter.\n" msgstr "" #: src/stored/bcopy.c:270 src/stored/bcopy.c:278 src/stored/bcopy.c:306 -#: src/stored/btape.c:2768 +#: src/stored/btape.c:2767 #, fuzzy, c-format msgid "Cannot fixup device error. %s\n" msgstr "Impossible de trouver la ressource Client \"%s\"\n" @@ -14982,7 +14982,7 @@ msgstr "" msgid "Do you want to continue? (y/n): " msgstr "Voulez vous continuer ? (y/n) : " -#: src/stored/btape.c:751 src/stored/btape.c:2203 +#: src/stored/btape.c:751 src/stored/btape.c:2202 msgid "Command aborted.\n" msgstr "Commande annulée.\n" @@ -15011,14 +15011,14 @@ msgstr "" #: src/stored/btape.c:813 src/stored/btape.c:824 src/stored/btape.c:835 #: src/stored/btape.c:1153 src/stored/btape.c:1169 src/stored/btape.c:1910 -#: src/stored/btape.c:2835 +#: src/stored/btape.c:2834 #, fuzzy msgid "Error writing record to block.\n" msgstr "Erreur pendant l'écriture du fichier bsr.\n" #: src/stored/btape.c:817 src/stored/btape.c:828 src/stored/btape.c:839 #: src/stored/btape.c:1157 src/stored/btape.c:1173 src/stored/btape.c:1914 -#: src/stored/btape.c:2839 +#: src/stored/btape.c:2838 #, fuzzy msgid "Error writing block to device.\n" msgstr "Erreur pendant l'écriture du fichier bsr.\n" @@ -15095,7 +15095,7 @@ msgstr "" msgid "Begin writing %i files of %sB with raw blocks of %u bytes.\n" msgstr "" -#: src/stored/btape.c:931 src/stored/btape.c:2891 +#: src/stored/btape.c:931 src/stored/btape.c:2890 #, fuzzy, c-format msgid "Write failed at block %u. stat=%d ERR=%s\n" msgstr "Impossible d'écrire au bloc %u.\n" @@ -15660,7 +15660,7 @@ msgstr "" msgid "Read of %d bytes gives stat=%d. ERR=%s\n" msgstr "" -#: src/stored/btape.c:1970 src/stored/btape.c:2019 +#: src/stored/btape.c:1970 src/stored/btape.c:2018 #, fuzzy, c-format msgid "End of tape\n" msgstr "Fin de tous les Volumes.\n" @@ -15680,54 +15680,54 @@ msgstr "erreur de déplacement (lseek) sur %s : ERR=%s\n" msgid "Bad status from read %d. ERR=%s\n" msgstr "Impossible d'écrire le marqueur EOF. ERR=%s\n" -#: src/stored/btape.c:1985 src/stored/btape.c:1999 src/stored/btape.c:2063 -#: src/stored/btape.c:2075 src/stored/btape.c:2088 src/stored/btape.c:2104 +#: src/stored/btape.c:1985 src/stored/btape.c:1999 src/stored/btape.c:2062 +#: src/stored/btape.c:2074 src/stored/btape.c:2087 src/stored/btape.c:2103 #, fuzzy, c-format msgid "1 block of %d bytes in file %d\n" msgstr "Ecriture de 1000 blocs de %d octets.\n" -#: src/stored/btape.c:1988 src/stored/btape.c:2002 src/stored/btape.c:2066 -#: src/stored/btape.c:2078 src/stored/btape.c:2091 src/stored/btape.c:2107 +#: src/stored/btape.c:1988 src/stored/btape.c:2002 src/stored/btape.c:2065 +#: src/stored/btape.c:2077 src/stored/btape.c:2090 src/stored/btape.c:2106 #, fuzzy, c-format msgid "%d blocks of %d bytes in file %d\n" msgstr "Ecriture de 1000 blocs de %d octets.\n" -#: src/stored/btape.c:2010 src/stored/btape.c:2082 +#: src/stored/btape.c:2010 src/stored/btape.c:2081 #, fuzzy, c-format msgid "End of File mark.\n" msgstr "1 fichier sélectionné.\n" -#: src/stored/btape.c:2031 src/stored/btape.c:2135 +#: src/stored/btape.c:2030 src/stored/btape.c:2134 #, fuzzy, c-format msgid "Total files=%d, blocks=%d, bytes = %s\n" msgstr " Total Octets=%s Blocs=%s Octets/Bloc=%s\n" -#: src/stored/btape.c:2095 +#: src/stored/btape.c:2094 #, fuzzy, c-format msgid "Short block read.\n" msgstr "Flush de %s blocs, écriture de EOF\n" -#: src/stored/btape.c:2098 +#: src/stored/btape.c:2097 #, fuzzy, c-format msgid "Error reading block. ERR=%s\n" msgstr "" "Erreur pendant l'écriture des données vers le fichier de spool. ERR=%s\n" -#: src/stored/btape.c:2122 +#: src/stored/btape.c:2121 #, c-format msgid "" "Block=%u file,blk=%u,%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s " "rlen=%d\n" msgstr "" -#: src/stored/btape.c:2144 +#: src/stored/btape.c:2143 #, fuzzy, c-format msgid "Device status: %u. ERR=%s\n" msgstr "" "\n" "Statut du Device :\n" -#: src/stored/btape.c:2176 +#: src/stored/btape.c:2175 #, fuzzy, c-format msgid "" "\n" @@ -15772,7 +15772,7 @@ msgstr "" "\n" "Ce test peut durer longtemps (voir des heures).\n" -#: src/stored/btape.c:2194 +#: src/stored/btape.c:2193 msgid "" "Do you want to run the simplified test (s) with one tape\n" "or the complete multiple tape (m) test: (s/m) " @@ -15780,77 +15780,77 @@ msgstr "" "Voulez vous lancer le test simplifié (s) utilisant une seule bande\n" "ou bien le test multi-bande complet (m) : (s/m) " -#: src/stored/btape.c:2197 +#: src/stored/btape.c:2196 msgid "Simple test (single tape) selected.\n" msgstr "Sélection du test simplifié (utilisant une seule bande).\n" -#: src/stored/btape.c:2200 +#: src/stored/btape.c:2199 msgid "Multiple tape test selected.\n" msgstr "Sélection du test multiple.\n" -#: src/stored/btape.c:2244 +#: src/stored/btape.c:2243 msgid "Wrote Start of Session label.\n" msgstr "Ecriture du label de début de session.\n" -#: src/stored/btape.c:2263 +#: src/stored/btape.c:2262 #, c-format msgid "%s Begin writing Bacula records to tape ...\n" msgstr "" -#: src/stored/btape.c:2265 +#: src/stored/btape.c:2264 #, c-format msgid "%s Begin writing Bacula records to first tape ...\n" msgstr "" -#: src/stored/btape.c:2291 +#: src/stored/btape.c:2290 #, fuzzy msgid "Flush block failed.\n" msgstr "Flush de %s blocs, écriture de EOF\n" -#: src/stored/btape.c:2305 +#: src/stored/btape.c:2304 #, fuzzy, c-format msgid "Wrote block=%u, file,blk=%u,%u VolBytes=%s rate=%sB/s\n" msgstr "Ecriture blk_block=%u, dev_blk_num=%u VolBytes=%s rate=%.1f KB/s\n" -#: src/stored/btape.c:2316 +#: src/stored/btape.c:2315 #, c-format msgid "%s Flush block, write EOF\n" msgstr "Flush de %s blocs, écriture de EOF\n" -#: src/stored/btape.c:2325 +#: src/stored/btape.c:2324 #, fuzzy msgid "Wrote 1000 blocks on second tape. Done.\n" msgstr "Ecriture de 1000 blocs de %d octets.\n" -#: src/stored/btape.c:2330 +#: src/stored/btape.c:2329 msgid "Not OK\n" msgstr "" -#: src/stored/btape.c:2354 +#: src/stored/btape.c:2353 #, fuzzy msgid "Job canceled.\n" msgstr "Le job %s est annulé.\n" -#: src/stored/btape.c:2365 +#: src/stored/btape.c:2364 #, fuzzy msgid "Set ok=false after write_block_to_device.\n" msgstr "Erreur pendant l'écriture du fichier bsr.\n" -#: src/stored/btape.c:2369 +#: src/stored/btape.c:2368 msgid "Wrote End of Session label.\n" msgstr "Ecriture du label de fin de session.\n" -#: src/stored/btape.c:2392 +#: src/stored/btape.c:2391 #, c-format msgid "Wrote state file last_block_num1=%d last_block_num2=%d\n" msgstr "Ecriture du fichier d'état last_block_num1=%d last_block_num2=%d\n" -#: src/stored/btape.c:2396 +#: src/stored/btape.c:2395 #, c-format msgid "Could not create state file: %s ERR=%s\n" msgstr "Impossible de créer le fichier d'état : %s ERR=%s\n" -#: src/stored/btape.c:2407 +#: src/stored/btape.c:2406 #, c-format msgid "" "\n" @@ -15858,7 +15858,7 @@ msgid "" "%s Done filling tape at %d:%d. Now beginning re-read of tape ...\n" msgstr "" -#: src/stored/btape.c:2410 +#: src/stored/btape.c:2409 #, c-format msgid "" "\n" @@ -15866,17 +15866,17 @@ msgid "" "%s Done filling tapes at %d:%d. Now beginning re-read of first tape ...\n" msgstr "" -#: src/stored/btape.c:2416 +#: src/stored/btape.c:2415 #, fuzzy msgid "do_unfill failed.\n" msgstr "Job échoué.\n" -#: src/stored/btape.c:2421 +#: src/stored/btape.c:2420 #, fuzzy, c-format msgid "%s: Error during test.\n" msgstr "Erreur pendant l'envoi de la liste d'inclusion.\n" -#: src/stored/btape.c:2456 +#: src/stored/btape.c:2455 #, fuzzy msgid "" "\n" @@ -15887,7 +15887,7 @@ msgstr "" "Impossible de trouver le fichier d'état : %s ERR=%s\n" "Vous devez relancer la commande \"fill\".\n" -#: src/stored/btape.c:2463 +#: src/stored/btape.c:2462 #, c-format msgid "" "\n" @@ -15898,68 +15898,68 @@ msgstr "" "Impossible de trouver le fichier d'état : %s ERR=%s\n" "Vous devez relancer la commande \"fill\".\n" -#: src/stored/btape.c:2529 +#: src/stored/btape.c:2528 msgid "Mount first tape. Press enter when ready: " msgstr "Chargez la première bande et appuyez sur \"Entrée\" : " -#: src/stored/btape.c:2546 +#: src/stored/btape.c:2545 msgid "Rewinding.\n" msgstr "Rembobinage.\n" -#: src/stored/btape.c:2551 +#: src/stored/btape.c:2550 #, c-format msgid "Reading the first 10000 records from %u:%u.\n" msgstr "Lecture des 10000 premiers enregistrements depuis %u:%u.\n" -#: src/stored/btape.c:2555 src/stored/btape.c:2627 +#: src/stored/btape.c:2554 src/stored/btape.c:2626 #, c-format msgid "Reposition from %u:%u to %u:%u\n" msgstr "Re-positionnement de %u:%u à %u:%u\n" -#: src/stored/btape.c:2560 src/stored/btape.c:2614 src/stored/btape.c:2632 +#: src/stored/btape.c:2559 src/stored/btape.c:2613 src/stored/btape.c:2631 #, c-format msgid "Reposition error. ERR=%s\n" msgstr "Erreur pendant le re-positionnement. ERR=%s\n" -#: src/stored/btape.c:2563 +#: src/stored/btape.c:2562 #, c-format msgid "Reading block %u.\n" msgstr "Lecture du bloc %u.\n" -#: src/stored/btape.c:2565 src/stored/btape.c:2619 src/stored/btape.c:2637 +#: src/stored/btape.c:2564 src/stored/btape.c:2618 src/stored/btape.c:2636 #, fuzzy, c-format msgid "Error reading block: ERR=%s\n" msgstr "Erreur dans l'exécution de la commande : %s. ERR=%s\n" -#: src/stored/btape.c:2570 +#: src/stored/btape.c:2569 msgid "" "\n" "The last block on the tape matches. Test succeeded.\n" "\n" msgstr "" -#: src/stored/btape.c:2573 +#: src/stored/btape.c:2572 msgid "" "\n" "The last block of the first tape matches.\n" "\n" msgstr "" -#: src/stored/btape.c:2597 +#: src/stored/btape.c:2596 msgid "Mount second tape. Press enter when ready: " msgstr "Chargez une deuxième bande et appuyez sur \"Entrée\" : " -#: src/stored/btape.c:2611 +#: src/stored/btape.c:2610 #, c-format msgid "Reposition from %u:%u to 0:1\n" msgstr "Re-positionnement de %u:%u à 0:1\n" -#: src/stored/btape.c:2617 src/stored/btape.c:2635 +#: src/stored/btape.c:2616 src/stored/btape.c:2634 #, c-format msgid "Reading block %d.\n" msgstr "Lecture du bloc %d.\n" -#: src/stored/btape.c:2623 +#: src/stored/btape.c:2622 #, fuzzy msgid "" "\n" @@ -15967,28 +15967,28 @@ msgid "" "\n" msgstr "Ecriture de 1000 blocs de %d octets.\n" -#: src/stored/btape.c:2641 +#: src/stored/btape.c:2640 msgid "" "\n" "The last block on the second tape matches. Test succeeded.\n" "\n" msgstr "" -#: src/stored/btape.c:2659 +#: src/stored/btape.c:2658 #, c-format msgid "10000 records read now at %d:%d\n" msgstr "10000 enregistrements lus maintenant à %d:%d\n" -#: src/stored/btape.c:2685 src/stored/btape.c:2696 src/stored/btape.c:2741 +#: src/stored/btape.c:2684 src/stored/btape.c:2695 src/stored/btape.c:2740 msgid "Last block written" msgstr "Dernier bloc écrit" -#: src/stored/btape.c:2687 src/stored/btape.c:2697 +#: src/stored/btape.c:2686 src/stored/btape.c:2696 #, fuzzy msgid "Block read back" msgstr "Bloqué" -#: src/stored/btape.c:2688 +#: src/stored/btape.c:2687 #, c-format msgid "" "\n" @@ -15996,7 +15996,7 @@ msgid "" "The blocks differ at byte %u\n" msgstr "" -#: src/stored/btape.c:2689 +#: src/stored/btape.c:2688 msgid "" "\n" "\n" @@ -16006,182 +16006,182 @@ msgid "" "to write multi-tape Volumes.!!!!\n" msgstr "" -#: src/stored/btape.c:2725 +#: src/stored/btape.c:2724 #, c-format msgid "Last block at: %u:%u this_dev_block_num=%d\n" msgstr "" -#: src/stored/btape.c:2739 +#: src/stored/btape.c:2738 #, c-format msgid "Block not written: FileIndex=%u blk_block=%u Size=%u\n" msgstr "" -#: src/stored/btape.c:2743 +#: src/stored/btape.c:2742 msgid "Block not written" msgstr "Bloc non écrit" -#: src/stored/btape.c:2758 +#: src/stored/btape.c:2757 #, fuzzy, c-format msgid "End of tape %d:%d. Volume Bytes=%s. Write rate = %sB/s\n" msgstr "Fin de média sur le Volume \"%s\" Octets=%s Blocs=%s à %s.\n" -#: src/stored/btape.c:2809 +#: src/stored/btape.c:2808 msgid "Test writing blocks of 64512 bytes to tape.\n" msgstr "" -#: src/stored/btape.c:2811 +#: src/stored/btape.c:2810 msgid "How many blocks do you want to write? (1000): " msgstr "" -#: src/stored/btape.c:2828 +#: src/stored/btape.c:2827 #, c-format msgid "Begin writing %d Bacula blocks to tape ...\n" msgstr "" -#: src/stored/btape.c:2871 +#: src/stored/btape.c:2870 #, fuzzy, c-format msgid "Begin writing raw blocks of %u bytes.\n" msgstr "Ecriture de 1000 blocs de %d octets.\n" -#: src/stored/btape.c:2902 +#: src/stored/btape.c:2901 #, fuzzy msgid "test autochanger" msgstr "Slots d'un autochangeur" -#: src/stored/btape.c:2903 +#: src/stored/btape.c:2902 msgid "backspace file" msgstr "" -#: src/stored/btape.c:2904 +#: src/stored/btape.c:2903 msgid "backspace record" msgstr "" -#: src/stored/btape.c:2905 +#: src/stored/btape.c:2904 msgid "list device capabilities" msgstr "" -#: src/stored/btape.c:2906 +#: src/stored/btape.c:2905 #, fuzzy msgid "clear tape errors" msgstr "Erreur fatale" -#: src/stored/btape.c:2907 +#: src/stored/btape.c:2906 msgid "go to end of Bacula data for append" msgstr "" -#: src/stored/btape.c:2908 +#: src/stored/btape.c:2907 msgid "go to the physical end of medium" msgstr "" -#: src/stored/btape.c:2909 +#: src/stored/btape.c:2908 msgid "fill tape, write onto second volume" msgstr "" -#: src/stored/btape.c:2910 +#: src/stored/btape.c:2909 #, fuzzy msgid "read filled tape" msgstr "rembobine la bande" -#: src/stored/btape.c:2911 +#: src/stored/btape.c:2910 msgid "forward space a file" msgstr "" -#: src/stored/btape.c:2912 +#: src/stored/btape.c:2911 #, fuzzy msgid "forward space a record" msgstr "lit un seul enregistrement" -#: src/stored/btape.c:2913 +#: src/stored/btape.c:2912 msgid "print this command" msgstr "affiche cette commande" -#: src/stored/btape.c:2914 +#: src/stored/btape.c:2913 #, fuzzy msgid "write a Bacula label to the tape" msgstr "écrit un EOF sur la bande" -#: src/stored/btape.c:2915 +#: src/stored/btape.c:2914 #, fuzzy msgid "load a tape" msgstr "re-labélise une bande" -#: src/stored/btape.c:2916 +#: src/stored/btape.c:2915 msgid "quit btape" msgstr "" -#: src/stored/btape.c:2917 +#: src/stored/btape.c:2916 msgid "use write() to fill tape" msgstr "" -#: src/stored/btape.c:2918 +#: src/stored/btape.c:2917 #, fuzzy msgid "read and print the Bacula tape label" msgstr "lit un seul bloc bacula" -#: src/stored/btape.c:2919 +#: src/stored/btape.c:2918 msgid "test record handling functions" msgstr "" -#: src/stored/btape.c:2920 +#: src/stored/btape.c:2919 msgid "rewind the tape" msgstr "rembobine la bande" -#: src/stored/btape.c:2921 +#: src/stored/btape.c:2920 #, fuzzy msgid "read() tape block by block to EOT and report" msgstr "Bacula lit bloc par bloc jusqu'à la fin de la bande (EOT) et résume" -#: src/stored/btape.c:2922 +#: src/stored/btape.c:2921 msgid "Bacula read block by block to EOT and report" msgstr "Bacula lit bloc par bloc jusqu'à la fin de la bande (EOT) et résume" -#: src/stored/btape.c:2923 +#: src/stored/btape.c:2922 msgid "" "[file_size=n(GB)|nb_file=3|skip_zero|skip_random|skip_raw|skip_block] report " "drive speed" msgstr "" -#: src/stored/btape.c:2924 +#: src/stored/btape.c:2923 #, fuzzy msgid "print tape status" msgstr "Statut :\n" -#: src/stored/btape.c:2925 +#: src/stored/btape.c:2924 msgid "General test Bacula tape functions" msgstr "test général des fonctions Bacula sur un lecteur de bande" -#: src/stored/btape.c:2926 +#: src/stored/btape.c:2925 msgid "write an EOF on the tape" msgstr "écrit un EOF sur la bande" -#: src/stored/btape.c:2927 +#: src/stored/btape.c:2926 msgid "write a single Bacula block" msgstr "écrit un seul bloc bacula" -#: src/stored/btape.c:2928 +#: src/stored/btape.c:2927 msgid "read a single record" msgstr "lit un seul enregistrement" -#: src/stored/btape.c:2929 +#: src/stored/btape.c:2928 msgid "read a single Bacula block" msgstr "lit un seul bloc bacula" -#: src/stored/btape.c:2930 +#: src/stored/btape.c:2929 #, fuzzy msgid "quick fill command" msgstr "affiche cette commande" -#: src/stored/btape.c:2951 +#: src/stored/btape.c:2950 #, c-format msgid "\"%s\" is an invalid command\n" msgstr "\"%s\" est une commande invalide.\n" -#: src/stored/btape.c:2960 +#: src/stored/btape.c:2959 #, fuzzy, c-format msgid "Interactive commands:\n" msgstr "Erreur sur la commande : %s\n" -#: src/stored/btape.c:2971 +#: src/stored/btape.c:2970 #, fuzzy, c-format msgid "" "\n" @@ -16208,27 +16208,27 @@ msgstr "" " -t test - lecture de la configuration et sortie\n" "\n" -#: src/stored/btape.c:3042 +#: src/stored/btape.c:3041 #, fuzzy, c-format msgid "Mount second Volume on device %s and press return when ready: " msgstr "Chargez une deuxième bande et appuyez sur \"Entrée\" : " -#: src/stored/btape.c:3070 +#: src/stored/btape.c:3069 #, fuzzy, c-format msgid "Mount blank Volume on device %s and press return when ready: " msgstr "Chargez une deuxième bande et appuyez sur \"Entrée\" : " -#: src/stored/btape.c:3090 +#: src/stored/btape.c:3089 #, fuzzy, c-format msgid "End of Volume \"%s\" %d records.\n" msgstr "Le volume \"%s\" existe déjà en base.\n" -#: src/stored/btape.c:3104 +#: src/stored/btape.c:3103 #, fuzzy, c-format msgid "Read block=%u, VolBytes=%s rate=%sB/s\n" msgstr "Ecriture blk_block=%u, dev_blk_num=%u VolBytes=%s rate=%.1f KB/s\n" -#: src/stored/btape.c:3117 +#: src/stored/btape.c:3116 #, fuzzy, c-format msgid "Cannot open Dev=%s, Vol=%s\n" msgstr "Impossible d'ouvrir le fichier %s pour lecture. ERR=%s\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Bacula 5.2.7\n" "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-06-30 08:32+0200\n" +"POT-Creation-Date: 2017-07-23 18:30+0200\n" "PO-Revision-Date: 2012-05-05 11:52+0100\n" "Last-Translator: W. van den Akker <wvdakker@wilsoft.nl>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,8 +42,8 @@ msgstr "" msgid "*None*" msgstr "*Geen*" -#: src/cats/cats.c:137 src/cats/mysql.c:487 src/cats/postgresql.c:583 -#: src/cats/postgresql.c:634 src/cats/sqlite.c:488 +#: src/cats/cats.c:137 src/cats/mysql.c:488 src/cats/postgresql.c:606 +#: src/cats/postgresql.c:657 src/cats/sqlite.c:488 #, fuzzy, c-format msgid "Query failed: %s: ERR=%s\n" msgstr "Lees fout op bestand %s. FOUT=%s\n" @@ -56,12 +56,12 @@ msgstr "" msgid "A user name for MySQL must be supplied.\n" msgstr "" -#: src/cats/mysql.c:210 src/cats/postgresql.c:247 src/cats/sqlite.c:184 +#: src/cats/mysql.c:211 src/cats/postgresql.c:256 src/cats/sqlite.c:184 #, fuzzy, c-format msgid "Unable to initialize DB lock. ERR=%s\n" msgstr "Kan job cond variabele niet initialiseren: ERR=%s\n" -#: src/cats/mysql.c:267 +#: src/cats/mysql.c:268 #, c-format msgid "" "Unable to connect to MySQL server.\n" @@ -70,17 +70,17 @@ msgid "" "incorrect.\n" msgstr "" -#: src/cats/mysql.c:463 src/cats/postgresql.c:529 src/cats/sqlite.c:411 +#: src/cats/mysql.c:464 src/cats/postgresql.c:552 src/cats/sqlite.c:411 #: src/dird/fd_cmds.c:960 src/dird/fd_cmds.c:1021 #, c-format msgid "Attribute create error. %s" msgstr "" -#: src/cats/postgresql.c:110 +#: src/cats/postgresql.c:119 msgid "A user name for PostgreSQL must be supplied.\n" msgstr "" -#: src/cats/postgresql.c:205 src/cats/sql.c:531 src/cats/sql.c:538 +#: src/cats/postgresql.c:214 src/cats/sql.c:531 src/cats/sql.c:538 #: src/cats/sql_create.c:559 src/cats/sql_get.c:191 src/cats/sql_get.c:242 #: src/cats/sql_get.c:613 src/cats/sql_get.c:824 src/cats/sql_get.c:1152 #: src/cats/sql_get.c:1543 src/cats/sql_get.c:1695 @@ -88,12 +88,12 @@ msgstr "" msgid "error fetching row: %s\n" msgstr "" -#: src/cats/postgresql.c:217 +#: src/cats/postgresql.c:226 #, c-format msgid "Encoding error for database \"%s\". Wanted SQL_ASCII, got %s\n" msgstr "" -#: src/cats/postgresql.c:307 +#: src/cats/postgresql.c:330 #, c-format msgid "" "Unable to connect to PostgreSQL server. Database=%s User=%s\n" @@ -101,39 +101,39 @@ msgid "" "exceeded.\n" msgstr "" -#: src/cats/postgresql.c:423 +#: src/cats/postgresql.c:446 msgid "PQescapeStringConn returned non-zero.\n" msgstr "" -#: src/cats/postgresql.c:443 +#: src/cats/postgresql.c:466 msgid "PQescapeByteaConn returned NULL.\n" msgstr "" -#: src/cats/postgresql.c:472 +#: src/cats/postgresql.c:495 msgid "PQunescapeByteaConn returned NULL.\n" msgstr "" -#: src/cats/postgresql.c:590 +#: src/cats/postgresql.c:613 #, fuzzy, c-format msgid "Fetch failed: ERR=%s\n" msgstr "Lees fout op bestand %s. FOUT=%s\n" -#: src/cats/postgresql.c:883 +#: src/cats/postgresql.c:906 #, c-format msgid "error fetching currval: %s\n" msgstr "" -#: src/cats/postgresql.c:1064 +#: src/cats/postgresql.c:1087 #, c-format msgid "error starting batch mode: %s" msgstr "" -#: src/cats/postgresql.c:1094 src/cats/postgresql.c:1101 +#: src/cats/postgresql.c:1117 src/cats/postgresql.c:1124 #, fuzzy, c-format msgid "error ending batch mode: %s" msgstr "Geen Volumes gevonden om terug te zetten.\n" -#: src/cats/postgresql.c:1151 +#: src/cats/postgresql.c:1174 #, c-format msgid "error copying in batch mode: %s" msgstr "" @@ -730,7 +730,7 @@ msgstr "" #: src/console/bbconsjson.c:432 src/console/bbconsjson.c:463 #: src/console/console.c:1422 src/console/console.c:1452 -#: src/dird/bdirjson.c:1184 src/dird/bdirjson.c:1222 src/dird/bdirjson.c:1277 +#: src/dird/bdirjson.c:1185 src/dird/bdirjson.c:1223 src/dird/bdirjson.c:1278 #: src/dird/dird.c:778 src/dird/dird.c:996 src/dird/dird.c:1051 #: src/dird/dird.c:1254 src/filed/bfdjson.c:484 src/filed/bfdjson.c:527 #: src/filed/bfdjson.c:562 src/filed/filed.c:390 src/filed/filed.c:590 @@ -1349,37 +1349,37 @@ msgstr "" " -? geef deze melding.\n" "\n" -#: src/dird/bdirjson.c:1162 src/dird/dird.c:756 +#: src/dird/bdirjson.c:1163 src/dird/dird.c:756 #, c-format msgid "" "No Director resource defined in %s\n" "Without that I don't know who I am :-(\n" msgstr "" -#: src/dird/bdirjson.c:1170 src/dird/dird.c:764 src/filed/bfdjson.c:477 +#: src/dird/bdirjson.c:1171 src/dird/dird.c:764 src/filed/bfdjson.c:477 #: src/filed/filed.c:352 #, c-format msgid "No Messages resource defined in %s\n" msgstr "" -#: src/dird/bdirjson.c:1175 src/dird/dird.c:769 +#: src/dird/bdirjson.c:1176 src/dird/dird.c:769 #, c-format msgid "Only one Director resource permitted in %s\n" msgstr "" -#: src/dird/bdirjson.c:1192 src/dird/dird.c:786 src/filed/bfdjson.c:537 +#: src/dird/bdirjson.c:1193 src/dird/dird.c:786 src/filed/bfdjson.c:537 #: src/filed/filed.c:600 src/stored/bsdjson.c:607 src/stored/stored.c:447 #, c-format msgid "\"TLS Certificate\" file not defined for Director \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1198 src/dird/dird.c:792 src/filed/bfdjson.c:543 +#: src/dird/bdirjson.c:1199 src/dird/dird.c:792 src/filed/bfdjson.c:543 #: src/filed/filed.c:606 src/stored/bsdjson.c:613 src/stored/stored.c:453 #, c-format msgid "\"TLS Key\" file not defined for Director \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1205 src/dird/dird.c:799 src/filed/bfdjson.c:549 +#: src/dird/bdirjson.c:1206 src/dird/dird.c:799 src/filed/bfdjson.c:549 #: src/filed/filed.c:612 src/stored/bsdjson.c:619 src/stored/stored.c:459 #, c-format msgid "" @@ -1388,19 +1388,19 @@ msgid "" "using \"TLS Verify Peer\".\n" msgstr "" -#: src/dird/bdirjson.c:1231 src/dird/dird.c:1005 src/filed/bfdjson.c:572 +#: src/dird/bdirjson.c:1232 src/dird/dird.c:1005 src/filed/bfdjson.c:572 #: src/filed/filed.c:653 #, c-format msgid "\"TLS Certificate\" file not defined for Console \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1237 src/dird/dird.c:1011 src/filed/bfdjson.c:578 +#: src/dird/bdirjson.c:1238 src/dird/dird.c:1011 src/filed/bfdjson.c:578 #: src/filed/filed.c:659 #, c-format msgid "\"TLS Key\" file not defined for Console \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1244 src/dird/dird.c:1018 src/filed/bfdjson.c:584 +#: src/dird/bdirjson.c:1245 src/dird/dird.c:1018 src/filed/bfdjson.c:584 #: src/filed/filed.c:665 #, c-format msgid "" @@ -1409,41 +1409,41 @@ msgid "" "using \"TLS Verify Peer\".\n" msgstr "" -#: src/dird/bdirjson.c:1261 src/dird/dird.c:1035 src/dird/dird.c:1075 +#: src/dird/bdirjson.c:1262 src/dird/dird.c:1035 src/dird/dird.c:1075 #: src/filed/filed.c:415 #, fuzzy, c-format msgid "Failed to initialize TLS context for File daemon \"%s\" in %s.\n" msgstr "Verbinden met de director mislukt\n" -#: src/dird/bdirjson.c:1284 src/dird/dird.c:1058 +#: src/dird/bdirjson.c:1285 src/dird/dird.c:1058 #, c-format msgid "" "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for " "File daemon \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1293 src/dird/dird.c:826 +#: src/dird/bdirjson.c:1294 src/dird/dird.c:826 #, fuzzy, c-format msgid "No Job records defined in %s\n" msgstr "Fout : Geen director gevonden in uw configuratie.\n" -#: src/dird/bdirjson.c:1353 src/dird/bdirjson.c:1366 src/dird/dird.c:877 +#: src/dird/bdirjson.c:1354 src/dird/bdirjson.c:1367 src/dird/dird.c:877 #: src/dird/dird.c:890 #, c-format msgid "Hey something is wrong. p=0x%lu\n" msgstr "" -#: src/dird/bdirjson.c:1452 src/dird/dird.c:960 +#: src/dird/bdirjson.c:1453 src/dird/dird.c:960 #, c-format msgid "\"%s\" directive in Job \"%s\" resource is required, but not found.\n" msgstr "" -#: src/dird/bdirjson.c:1459 src/dird/dird.c:967 +#: src/dird/bdirjson.c:1460 src/dird/dird.c:967 #, fuzzy msgid "Too many items in Job resource\n" msgstr "De gedefinieerde job resources zijn:\n" -#: src/dird/bdirjson.c:1463 src/dird/dird.c:971 +#: src/dird/bdirjson.c:1464 src/dird/dird.c:971 #, c-format msgid "No storage specified in Job \"%s\" nor in Pool.\n" msgstr "" @@ -3952,11 +3952,11 @@ msgstr "Voer *MediaId of Volume naam in:" msgid "Enter base volume name: " msgstr "Voer *MediaId of Volume naam in:" -#: src/dird/ua_cmds.c:368 src/dird/ua_label.c:652 +#: src/dird/ua_cmds.c:368 src/dird/ua_label.c:654 msgid "Volume name too long.\n" msgstr "" -#: src/dird/ua_cmds.c:372 src/dird/ua_label.c:658 src/lib/edit.c:519 +#: src/dird/ua_cmds.c:372 src/dird/ua_label.c:660 src/lib/edit.c:519 msgid "Volume name must be at least one character long.\n" msgstr "" @@ -4574,13 +4574,13 @@ msgstr "" msgid "Slot too large.\n" msgstr "Selecteer Pool" -#: src/dird/ua_label.c:178 src/dird/ua_label.c:356 src/dird/ua_label.c:1185 +#: src/dird/ua_label.c:178 src/dird/ua_label.c:356 src/dird/ua_label.c:1190 #: src/dird/ua_run.c:473 src/dird/ua_run.c:1356 src/dird/ua_run.c:1361 #, fuzzy msgid "Command input" msgstr "Onjuiste opdrachtregel optie" -#: src/dird/ua_label.c:196 src/dird/ua_label.c:520 src/dird/ua_label.c:1192 +#: src/dird/ua_label.c:196 src/dird/ua_label.c:520 src/dird/ua_label.c:1197 msgid "No slots in changer to scan.\n" msgstr "" @@ -4589,7 +4589,7 @@ msgstr "" msgid "No Volumes found to label, or no barcodes.\n" msgstr "Geen Volumes gevonden om terug te zetten.\n" -#: src/dird/ua_label.c:218 src/dird/ua_label.c:1213 +#: src/dird/ua_label.c:218 src/dird/ua_label.c:1219 #, c-format msgid "Slot %d greater than max %d ignored.\n" msgstr "" @@ -4690,71 +4690,71 @@ msgstr "" msgid "Catalog error on cleaning tape: %s" msgstr "" -#: src/dird/ua_label.c:645 +#: src/dird/ua_label.c:647 #, fuzzy, c-format msgid "Illegal character \"%c\" in a volume name.\n" msgstr "Onjuist karakter in Volume naam \"%s\"\n" -#: src/dird/ua_label.c:693 +#: src/dird/ua_label.c:695 #, c-format msgid "Sending relabel command from \"%s\" to \"%s\" ...\n" msgstr "" -#: src/dird/ua_label.c:700 +#: src/dird/ua_label.c:702 #, fuzzy, c-format msgid "Sending label command for Volume \"%s\" Slot %d ...\n" msgstr "Job \"%s\" niet gevonden.\n" -#: src/dird/ua_label.c:730 +#: src/dird/ua_label.c:732 #, fuzzy, c-format msgid "Catalog record for Volume \"%s\", Slot %d successfully created.\n" msgstr "Job \"%s\" niet gevonden.\n" -#: src/dird/ua_label.c:745 +#: src/dird/ua_label.c:747 #, c-format msgid "Label command failed for Volume %s.\n" msgstr "" -#: src/dird/ua_label.c:759 +#: src/dird/ua_label.c:761 #, fuzzy msgid "Could not open SD socket.\n" msgstr "Kan Client niet vinden %s: ERR=%s" -#: src/dird/ua_label.c:831 src/dird/ua_label.c:841 +#: src/dird/ua_label.c:833 src/dird/ua_label.c:843 #, fuzzy, c-format msgid "Invalid Slot number: %s\n" msgstr "Onjuiste periode.\n" -#: src/dird/ua_label.c:850 +#: src/dird/ua_label.c:852 #, c-format msgid "Invalid Volume name: %s. Volume skipped.\n" msgstr "" -#: src/dird/ua_label.c:944 +#: src/dird/ua_label.c:946 #, c-format msgid "Device \"%s\" has %d slots.\n" msgstr "" -#: src/dird/ua_label.c:990 +#: src/dird/ua_label.c:995 #, c-format msgid "Pool \"%s\" resource not found for volume \"%s\"!\n" msgstr "" -#: src/dird/ua_label.c:1204 +#: src/dird/ua_label.c:1209 #, fuzzy msgid "No Volumes found, or no barcodes.\n" msgstr "Geen Volumes gevonden om terug te zetten.\n" -#: src/dird/ua_label.c:1207 +#: src/dird/ua_label.c:1212 src/dird/ua_label.c:1214 src/dird/ua_label.c:1247 msgid "" -" Slot | Volume Name | Status | Media Type | " -"Pool |\n" +"+------+----------------------+-----------+-----------------" +"+--------------------+\n" msgstr "" -#: src/dird/ua_label.c:1208 +#: src/dird/ua_label.c:1213 msgid "" -"------+------------------+-----------+----------------------" -"+--------------------|\n" +"| Slot | Volume Name | Status | Media Type | " +"Pool |\n" msgstr "" #: src/dird/ua_output.c:57 src/dird/ua_output.c:81 @@ -7133,7 +7133,7 @@ msgstr "JobID %s is niet in uitvoering.\n" msgid "%d total files; %d marked to be restored; %s bytes.\n" msgstr "" -#: src/dird/ua_tree.c:796 src/stored/btape.c:2961 +#: src/dird/ua_tree.c:796 src/stored/btape.c:2960 #, c-format msgid "" " Command Description\n" @@ -8117,27 +8117,27 @@ msgstr "Lees fout op bestand %s. FOUT=%s\n" msgid "Compression deflateParams error: %d\n" msgstr "Compressie LZO fout: %d\n" -#: src/filed/backup.c:1105 +#: src/filed/backup.c:1103 #, fuzzy, c-format msgid " Cannot open resource fork for \"%s\": ERR=%s.\n" msgstr "Kan job cond variabele niet initialiseren: ERR=%s\n" -#: src/filed/backup.c:1163 +#: src/filed/backup.c:1161 #, fuzzy, c-format msgid "Compression deflate error: %d\n" msgstr "Compressie LZO fout: %d\n" -#: src/filed/backup.c:1170 +#: src/filed/backup.c:1168 #, fuzzy, c-format msgid "Compression deflateReset error: %d\n" msgstr "Compressie LZO fout: %d\n" -#: src/filed/backup.c:1212 +#: src/filed/backup.c:1210 #, c-format msgid "Compression LZO error: %d\n" msgstr "Compressie LZO fout: %d\n" -#: src/filed/backup.c:1422 +#: src/filed/backup.c:1420 #, c-format msgid "VSS Writer (BackupComplete): %s\n" msgstr "" @@ -12762,7 +12762,7 @@ msgstr "Kan job cond variabele niet initialiseren: ERR=%s\n" msgid "NULL Volume name. This shouldn't happen!!!\n" msgstr "" -#: src/stored/append.c:123 src/stored/btape.c:2240 +#: src/stored/append.c:123 src/stored/btape.c:2239 #, fuzzy, c-format msgid "Write session label failed. ERR=%s\n" msgstr "Lees fout op bestand %s. FOUT=%s\n" @@ -12802,7 +12802,7 @@ msgstr "Lees fout op bestand %s. FOUT=%s\n" msgid "Set ok=FALSE after write_block_to_device.\n" msgstr "" -#: src/stored/append.c:319 src/stored/btape.c:2359 +#: src/stored/append.c:319 src/stored/btape.c:2358 #, fuzzy, c-format msgid "Error writing end session label. ERR=%s\n" msgstr "Geen Volumes gevonden om terug te zetten.\n" @@ -12821,7 +12821,7 @@ msgstr "" msgid "Error updating file attributes. ERR=%s\n" msgstr "Geen Volumes gevonden om terug te zetten.\n" -#: src/stored/askdir.c:160 src/stored/btape.c:3045 +#: src/stored/askdir.c:160 src/stored/btape.c:3044 #, c-format msgid "Mount Volume \"%s\" on device %s and press return when ready: " msgstr "" @@ -13143,7 +13143,7 @@ msgid "Copy skipped. Record does not match BSR filter.\n" msgstr "" #: src/stored/bcopy.c:270 src/stored/bcopy.c:278 src/stored/bcopy.c:306 -#: src/stored/btape.c:2768 +#: src/stored/btape.c:2767 #, c-format msgid "Cannot fixup device error. %s\n" msgstr "" @@ -14245,7 +14245,7 @@ msgstr "" msgid "Do you want to continue? (y/n): " msgstr "Doorgaan? (ja, wijz, nee):" -#: src/stored/btape.c:751 src/stored/btape.c:2203 +#: src/stored/btape.c:751 src/stored/btape.c:2202 #, fuzzy msgid "Command aborted.\n" msgstr "Opdracht mislukt." @@ -14275,14 +14275,14 @@ msgstr "" #: src/stored/btape.c:813 src/stored/btape.c:824 src/stored/btape.c:835 #: src/stored/btape.c:1153 src/stored/btape.c:1169 src/stored/btape.c:1910 -#: src/stored/btape.c:2835 +#: src/stored/btape.c:2834 #, fuzzy msgid "Error writing record to block.\n" msgstr "Fout bij schrijven van bsr bestand.\n" #: src/stored/btape.c:817 src/stored/btape.c:828 src/stored/btape.c:839 #: src/stored/btape.c:1157 src/stored/btape.c:1173 src/stored/btape.c:1914 -#: src/stored/btape.c:2839 +#: src/stored/btape.c:2838 #, fuzzy msgid "Error writing block to device.\n" msgstr "Fout bij schrijven van bsr bestand.\n" @@ -14358,7 +14358,7 @@ msgstr "" msgid "Begin writing %i files of %sB with raw blocks of %u bytes.\n" msgstr "" -#: src/stored/btape.c:931 src/stored/btape.c:2891 +#: src/stored/btape.c:931 src/stored/btape.c:2890 #, fuzzy, c-format msgid "Write failed at block %u. stat=%d ERR=%s\n" msgstr "Lees fout op bestand %s. FOUT=%s\n" @@ -14913,7 +14913,7 @@ msgstr "" msgid "Read of %d bytes gives stat=%d. ERR=%s\n" msgstr "Lees fout op bestand %s. FOUT=%s\n" -#: src/stored/btape.c:1970 src/stored/btape.c:2019 +#: src/stored/btape.c:1970 src/stored/btape.c:2018 #, c-format msgid "End of tape\n" msgstr "" @@ -14933,51 +14933,51 @@ msgstr "Lees fout op bestand %s. FOUT=%s\n" msgid "Bad status from read %d. ERR=%s\n" msgstr "Lees fout op bestand %s. FOUT=%s\n" -#: src/stored/btape.c:1985 src/stored/btape.c:1999 src/stored/btape.c:2063 -#: src/stored/btape.c:2075 src/stored/btape.c:2088 src/stored/btape.c:2104 +#: src/stored/btape.c:1985 src/stored/btape.c:1999 src/stored/btape.c:2062 +#: src/stored/btape.c:2074 src/stored/btape.c:2087 src/stored/btape.c:2103 #, c-format msgid "1 block of %d bytes in file %d\n" msgstr "" -#: src/stored/btape.c:1988 src/stored/btape.c:2002 src/stored/btape.c:2066 -#: src/stored/btape.c:2078 src/stored/btape.c:2091 src/stored/btape.c:2107 +#: src/stored/btape.c:1988 src/stored/btape.c:2002 src/stored/btape.c:2065 +#: src/stored/btape.c:2077 src/stored/btape.c:2090 src/stored/btape.c:2106 #, c-format msgid "%d blocks of %d bytes in file %d\n" msgstr "" -#: src/stored/btape.c:2010 src/stored/btape.c:2082 +#: src/stored/btape.c:2010 src/stored/btape.c:2081 #, c-format msgid "End of File mark.\n" msgstr "" -#: src/stored/btape.c:2031 src/stored/btape.c:2135 +#: src/stored/btape.c:2030 src/stored/btape.c:2134 #, c-format msgid "Total files=%d, blocks=%d, bytes = %s\n" msgstr "" -#: src/stored/btape.c:2095 +#: src/stored/btape.c:2094 #, c-format msgid "Short block read.\n" msgstr "" -#: src/stored/btape.c:2098 +#: src/stored/btape.c:2097 #, fuzzy, c-format msgid "Error reading block. ERR=%s\n" msgstr "Geen Volumes gevonden om terug te zetten.\n" -#: src/stored/btape.c:2122 +#: src/stored/btape.c:2121 #, c-format msgid "" "Block=%u file,blk=%u,%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s " "rlen=%d\n" msgstr "" -#: src/stored/btape.c:2144 +#: src/stored/btape.c:2143 #, c-format msgid "Device status: %u. ERR=%s\n" msgstr "" -#: src/stored/btape.c:2176 +#: src/stored/btape.c:2175 #, c-format msgid "" "\n" @@ -15003,80 +15003,80 @@ msgid "" "\n" msgstr "" -#: src/stored/btape.c:2194 +#: src/stored/btape.c:2193 msgid "" "Do you want to run the simplified test (s) with one tape\n" "or the complete multiple tape (m) test: (s/m) " msgstr "" -#: src/stored/btape.c:2197 +#: src/stored/btape.c:2196 msgid "Simple test (single tape) selected.\n" msgstr "" -#: src/stored/btape.c:2200 +#: src/stored/btape.c:2199 msgid "Multiple tape test selected.\n" msgstr "" -#: src/stored/btape.c:2244 +#: src/stored/btape.c:2243 msgid "Wrote Start of Session label.\n" msgstr "" -#: src/stored/btape.c:2263 +#: src/stored/btape.c:2262 #, c-format msgid "%s Begin writing Bacula records to tape ...\n" msgstr "" -#: src/stored/btape.c:2265 +#: src/stored/btape.c:2264 #, c-format msgid "%s Begin writing Bacula records to first tape ...\n" msgstr "" -#: src/stored/btape.c:2291 +#: src/stored/btape.c:2290 msgid "Flush block failed.\n" msgstr "" -#: src/stored/btape.c:2305 +#: src/stored/btape.c:2304 #, c-format msgid "Wrote block=%u, file,blk=%u,%u VolBytes=%s rate=%sB/s\n" msgstr "" -#: src/stored/btape.c:2316 +#: src/stored/btape.c:2315 #, c-format msgid "%s Flush block, write EOF\n" msgstr "" -#: src/stored/btape.c:2325 +#: src/stored/btape.c:2324 msgid "Wrote 1000 blocks on second tape. Done.\n" msgstr "" -#: src/stored/btape.c:2330 +#: src/stored/btape.c:2329 msgid "Not OK\n" msgstr "" -#: src/stored/btape.c:2354 +#: src/stored/btape.c:2353 #, fuzzy msgid "Job canceled.\n" msgstr "Terugzetten geannuleerd.\n" -#: src/stored/btape.c:2365 +#: src/stored/btape.c:2364 msgid "Set ok=false after write_block_to_device.\n" msgstr "" -#: src/stored/btape.c:2369 +#: src/stored/btape.c:2368 msgid "Wrote End of Session label.\n" msgstr "" -#: src/stored/btape.c:2392 +#: src/stored/btape.c:2391 #, c-format msgid "Wrote state file last_block_num1=%d last_block_num2=%d\n" msgstr "" -#: src/stored/btape.c:2396 +#: src/stored/btape.c:2395 #, fuzzy, c-format msgid "Could not create state file: %s ERR=%s\n" msgstr "Kan Client niet vinden %s: ERR=%s" -#: src/stored/btape.c:2407 +#: src/stored/btape.c:2406 #, c-format msgid "" "\n" @@ -15084,7 +15084,7 @@ msgid "" "%s Done filling tape at %d:%d. Now beginning re-read of tape ...\n" msgstr "" -#: src/stored/btape.c:2410 +#: src/stored/btape.c:2409 #, c-format msgid "" "\n" @@ -15092,24 +15092,24 @@ msgid "" "%s Done filling tapes at %d:%d. Now beginning re-read of first tape ...\n" msgstr "" -#: src/stored/btape.c:2416 +#: src/stored/btape.c:2415 #, fuzzy msgid "do_unfill failed.\n" msgstr "Job mislukt." -#: src/stored/btape.c:2421 +#: src/stored/btape.c:2420 #, c-format msgid "%s: Error during test.\n" msgstr "" -#: src/stored/btape.c:2456 +#: src/stored/btape.c:2455 msgid "" "\n" "The state file level has changed. You must redo\n" "the fill command.\n" msgstr "" -#: src/stored/btape.c:2463 +#: src/stored/btape.c:2462 #, c-format msgid "" "\n" @@ -15117,95 +15117,95 @@ msgid "" "You must redo the fill command.\n" msgstr "" -#: src/stored/btape.c:2529 +#: src/stored/btape.c:2528 msgid "Mount first tape. Press enter when ready: " msgstr "" -#: src/stored/btape.c:2546 +#: src/stored/btape.c:2545 msgid "Rewinding.\n" msgstr "" -#: src/stored/btape.c:2551 +#: src/stored/btape.c:2550 #, c-format msgid "Reading the first 10000 records from %u:%u.\n" msgstr "" -#: src/stored/btape.c:2555 src/stored/btape.c:2627 +#: src/stored/btape.c:2554 src/stored/btape.c:2626 #, c-format msgid "Reposition from %u:%u to %u:%u\n" msgstr "" -#: src/stored/btape.c:2560 src/stored/btape.c:2614 src/stored/btape.c:2632 +#: src/stored/btape.c:2559 src/stored/btape.c:2613 src/stored/btape.c:2631 #, fuzzy, c-format msgid "Reposition error. ERR=%s\n" msgstr "Lees fout op bestand %s. FOUT=%s\n" -#: src/stored/btape.c:2563 +#: src/stored/btape.c:2562 #, c-format msgid "Reading block %u.\n" msgstr "" -#: src/stored/btape.c:2565 src/stored/btape.c:2619 src/stored/btape.c:2637 +#: src/stored/btape.c:2564 src/stored/btape.c:2618 src/stored/btape.c:2636 #, fuzzy, c-format msgid "Error reading block: ERR=%s\n" msgstr "Geen Volumes gevonden om terug te zetten.\n" -#: src/stored/btape.c:2570 +#: src/stored/btape.c:2569 msgid "" "\n" "The last block on the tape matches. Test succeeded.\n" "\n" msgstr "" -#: src/stored/btape.c:2573 +#: src/stored/btape.c:2572 msgid "" "\n" "The last block of the first tape matches.\n" "\n" msgstr "" -#: src/stored/btape.c:2597 +#: src/stored/btape.c:2596 msgid "Mount second tape. Press enter when ready: " msgstr "" -#: src/stored/btape.c:2611 +#: src/stored/btape.c:2610 #, c-format msgid "Reposition from %u:%u to 0:1\n" msgstr "" -#: src/stored/btape.c:2617 src/stored/btape.c:2635 +#: src/stored/btape.c:2616 src/stored/btape.c:2634 #, c-format msgid "Reading block %d.\n" msgstr "" -#: src/stored/btape.c:2623 +#: src/stored/btape.c:2622 msgid "" "\n" "The first block on the second tape matches.\n" "\n" msgstr "" -#: src/stored/btape.c:2641 +#: src/stored/btape.c:2640 msgid "" "\n" "The last block on the second tape matches. Test succeeded.\n" "\n" msgstr "" -#: src/stored/btape.c:2659 +#: src/stored/btape.c:2658 #, c-format msgid "10000 records read now at %d:%d\n" msgstr "" -#: src/stored/btape.c:2685 src/stored/btape.c:2696 src/stored/btape.c:2741 +#: src/stored/btape.c:2684 src/stored/btape.c:2695 src/stored/btape.c:2740 msgid "Last block written" msgstr "" -#: src/stored/btape.c:2687 src/stored/btape.c:2697 +#: src/stored/btape.c:2686 src/stored/btape.c:2696 msgid "Block read back" msgstr "" -#: src/stored/btape.c:2688 +#: src/stored/btape.c:2687 #, c-format msgid "" "\n" @@ -15213,7 +15213,7 @@ msgid "" "The blocks differ at byte %u\n" msgstr "" -#: src/stored/btape.c:2689 +#: src/stored/btape.c:2688 msgid "" "\n" "\n" @@ -15223,174 +15223,174 @@ msgid "" "to write multi-tape Volumes.!!!!\n" msgstr "" -#: src/stored/btape.c:2725 +#: src/stored/btape.c:2724 #, c-format msgid "Last block at: %u:%u this_dev_block_num=%d\n" msgstr "" -#: src/stored/btape.c:2739 +#: src/stored/btape.c:2738 #, c-format msgid "Block not written: FileIndex=%u blk_block=%u Size=%u\n" msgstr "" -#: src/stored/btape.c:2743 +#: src/stored/btape.c:2742 msgid "Block not written" msgstr "" -#: src/stored/btape.c:2758 +#: src/stored/btape.c:2757 #, c-format msgid "End of tape %d:%d. Volume Bytes=%s. Write rate = %sB/s\n" msgstr "" -#: src/stored/btape.c:2809 +#: src/stored/btape.c:2808 msgid "Test writing blocks of 64512 bytes to tape.\n" msgstr "" -#: src/stored/btape.c:2811 +#: src/stored/btape.c:2810 msgid "How many blocks do you want to write? (1000): " msgstr "" -#: src/stored/btape.c:2828 +#: src/stored/btape.c:2827 #, c-format msgid "Begin writing %d Bacula blocks to tape ...\n" msgstr "" -#: src/stored/btape.c:2871 +#: src/stored/btape.c:2870 #, c-format msgid "Begin writing raw blocks of %u bytes.\n" msgstr "" -#: src/stored/btape.c:2902 +#: src/stored/btape.c:2901 #, fuzzy msgid "test autochanger" msgstr "Voer autochanger slot in:" -#: src/stored/btape.c:2903 +#: src/stored/btape.c:2902 msgid "backspace file" msgstr "" -#: src/stored/btape.c:2904 +#: src/stored/btape.c:2903 msgid "backspace record" msgstr "" -#: src/stored/btape.c:2905 +#: src/stored/btape.c:2904 msgid "list device capabilities" msgstr "" -#: src/stored/btape.c:2906 +#: src/stored/btape.c:2905 #, fuzzy msgid "clear tape errors" msgstr "Zlib data fout" -#: src/stored/btape.c:2907 +#: src/stored/btape.c:2906 msgid "go to end of Bacula data for append" msgstr "" -#: src/stored/btape.c:2908 +#: src/stored/btape.c:2907 msgid "go to the physical end of medium" msgstr "" -#: src/stored/btape.c:2909 +#: src/stored/btape.c:2908 msgid "fill tape, write onto second volume" msgstr "" -#: src/stored/btape.c:2910 +#: src/stored/btape.c:2909 msgid "read filled tape" msgstr "" -#: src/stored/btape.c:2911 +#: src/stored/btape.c:2910 msgid "forward space a file" msgstr "" -#: src/stored/btape.c:2912 +#: src/stored/btape.c:2911 msgid "forward space a record" msgstr "" -#: src/stored/btape.c:2913 +#: src/stored/btape.c:2912 msgid "print this command" msgstr "" -#: src/stored/btape.c:2914 +#: src/stored/btape.c:2913 msgid "write a Bacula label to the tape" msgstr "" -#: src/stored/btape.c:2915 +#: src/stored/btape.c:2914 msgid "load a tape" msgstr "" -#: src/stored/btape.c:2916 +#: src/stored/btape.c:2915 msgid "quit btape" msgstr "" -#: src/stored/btape.c:2917 +#: src/stored/btape.c:2916 msgid "use write() to fill tape" msgstr "" -#: src/stored/btape.c:2918 +#: src/stored/btape.c:2917 msgid "read and print the Bacula tape label" msgstr "" -#: src/stored/btape.c:2919 +#: src/stored/btape.c:2918 msgid "test record handling functions" msgstr "" -#: src/stored/btape.c:2920 +#: src/stored/btape.c:2919 msgid "rewind the tape" msgstr "" -#: src/stored/btape.c:2921 +#: src/stored/btape.c:2920 msgid "read() tape block by block to EOT and report" msgstr "" -#: src/stored/btape.c:2922 +#: src/stored/btape.c:2921 msgid "Bacula read block by block to EOT and report" msgstr "" -#: src/stored/btape.c:2923 +#: src/stored/btape.c:2922 msgid "" "[file_size=n(GB)|nb_file=3|skip_zero|skip_random|skip_raw|skip_block] report " "drive speed" msgstr "" -#: src/stored/btape.c:2924 +#: src/stored/btape.c:2923 msgid "print tape status" msgstr "" -#: src/stored/btape.c:2925 +#: src/stored/btape.c:2924 msgid "General test Bacula tape functions" msgstr "" -#: src/stored/btape.c:2926 +#: src/stored/btape.c:2925 msgid "write an EOF on the tape" msgstr "" -#: src/stored/btape.c:2927 +#: src/stored/btape.c:2926 msgid "write a single Bacula block" msgstr "" -#: src/stored/btape.c:2928 +#: src/stored/btape.c:2927 msgid "read a single record" msgstr "" -#: src/stored/btape.c:2929 +#: src/stored/btape.c:2928 msgid "read a single Bacula block" msgstr "" -#: src/stored/btape.c:2930 +#: src/stored/btape.c:2929 msgid "quick fill command" msgstr "" -#: src/stored/btape.c:2951 +#: src/stored/btape.c:2950 #, c-format msgid "\"%s\" is an invalid command\n" msgstr "" -#: src/stored/btape.c:2960 +#: src/stored/btape.c:2959 #, c-format msgid "Interactive commands:\n" msgstr "" -#: src/stored/btape.c:2971 +#: src/stored/btape.c:2970 #, fuzzy, c-format msgid "" "\n" @@ -15419,27 +15419,27 @@ msgstr "" " -? geef deze melding.\n" "\n" -#: src/stored/btape.c:3042 +#: src/stored/btape.c:3041 #, c-format msgid "Mount second Volume on device %s and press return when ready: " msgstr "" -#: src/stored/btape.c:3070 +#: src/stored/btape.c:3069 #, c-format msgid "Mount blank Volume on device %s and press return when ready: " msgstr "" -#: src/stored/btape.c:3090 +#: src/stored/btape.c:3089 #, fuzzy, c-format msgid "End of Volume \"%s\" %d records.\n" msgstr "Nieuw volume \"%s\" aangemaakt in catalogus.\n" -#: src/stored/btape.c:3104 +#: src/stored/btape.c:3103 #, c-format msgid "Read block=%u, VolBytes=%s rate=%sB/s\n" msgstr "" -#: src/stored/btape.c:3117 +#: src/stored/btape.c:3116 #, fuzzy, c-format msgid "Cannot open Dev=%s, Vol=%s\n" msgstr "Kan job cond variabele niet initialiseren: ERR=%s\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Bacula 2.1.x\n" "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-06-30 08:32+0200\n" +"POT-Creation-Date: 2017-07-23 18:30+0200\n" "PO-Revision-Date: 2007-06-22 19:18+0200\n" "Last-Translator: Kern Sibbald <kern@bacula.org>\n" "Language-Team: Swedish <bacula-devel@lists.soureforge.net>\n" @@ -38,8 +38,8 @@ msgstr "" msgid "*None*" msgstr "" -#: src/cats/cats.c:137 src/cats/mysql.c:487 src/cats/postgresql.c:583 -#: src/cats/postgresql.c:634 src/cats/sqlite.c:488 +#: src/cats/cats.c:137 src/cats/mysql.c:488 src/cats/postgresql.c:606 +#: src/cats/postgresql.c:657 src/cats/sqlite.c:488 #, c-format msgid "Query failed: %s: ERR=%s\n" msgstr "" @@ -52,12 +52,12 @@ msgstr "" msgid "A user name for MySQL must be supplied.\n" msgstr "" -#: src/cats/mysql.c:210 src/cats/postgresql.c:247 src/cats/sqlite.c:184 +#: src/cats/mysql.c:211 src/cats/postgresql.c:256 src/cats/sqlite.c:184 #, c-format msgid "Unable to initialize DB lock. ERR=%s\n" msgstr "" -#: src/cats/mysql.c:267 +#: src/cats/mysql.c:268 #, c-format msgid "" "Unable to connect to MySQL server.\n" @@ -66,17 +66,17 @@ msgid "" "incorrect.\n" msgstr "" -#: src/cats/mysql.c:463 src/cats/postgresql.c:529 src/cats/sqlite.c:411 +#: src/cats/mysql.c:464 src/cats/postgresql.c:552 src/cats/sqlite.c:411 #: src/dird/fd_cmds.c:960 src/dird/fd_cmds.c:1021 #, c-format msgid "Attribute create error. %s" msgstr "" -#: src/cats/postgresql.c:110 +#: src/cats/postgresql.c:119 msgid "A user name for PostgreSQL must be supplied.\n" msgstr "" -#: src/cats/postgresql.c:205 src/cats/sql.c:531 src/cats/sql.c:538 +#: src/cats/postgresql.c:214 src/cats/sql.c:531 src/cats/sql.c:538 #: src/cats/sql_create.c:559 src/cats/sql_get.c:191 src/cats/sql_get.c:242 #: src/cats/sql_get.c:613 src/cats/sql_get.c:824 src/cats/sql_get.c:1152 #: src/cats/sql_get.c:1543 src/cats/sql_get.c:1695 @@ -84,12 +84,12 @@ msgstr "" msgid "error fetching row: %s\n" msgstr "" -#: src/cats/postgresql.c:217 +#: src/cats/postgresql.c:226 #, c-format msgid "Encoding error for database \"%s\". Wanted SQL_ASCII, got %s\n" msgstr "" -#: src/cats/postgresql.c:307 +#: src/cats/postgresql.c:330 #, c-format msgid "" "Unable to connect to PostgreSQL server. Database=%s User=%s\n" @@ -97,39 +97,39 @@ msgid "" "exceeded.\n" msgstr "" -#: src/cats/postgresql.c:423 +#: src/cats/postgresql.c:446 msgid "PQescapeStringConn returned non-zero.\n" msgstr "" -#: src/cats/postgresql.c:443 +#: src/cats/postgresql.c:466 msgid "PQescapeByteaConn returned NULL.\n" msgstr "" -#: src/cats/postgresql.c:472 +#: src/cats/postgresql.c:495 msgid "PQunescapeByteaConn returned NULL.\n" msgstr "" -#: src/cats/postgresql.c:590 +#: src/cats/postgresql.c:613 #, c-format msgid "Fetch failed: ERR=%s\n" msgstr "" -#: src/cats/postgresql.c:883 +#: src/cats/postgresql.c:906 #, c-format msgid "error fetching currval: %s\n" msgstr "" -#: src/cats/postgresql.c:1064 +#: src/cats/postgresql.c:1087 #, c-format msgid "error starting batch mode: %s" msgstr "" -#: src/cats/postgresql.c:1094 src/cats/postgresql.c:1101 +#: src/cats/postgresql.c:1117 src/cats/postgresql.c:1124 #, c-format msgid "error ending batch mode: %s" msgstr "" -#: src/cats/postgresql.c:1151 +#: src/cats/postgresql.c:1174 #, c-format msgid "error copying in batch mode: %s" msgstr "" @@ -717,7 +717,7 @@ msgstr "" #: src/console/bbconsjson.c:432 src/console/bbconsjson.c:463 #: src/console/console.c:1422 src/console/console.c:1452 -#: src/dird/bdirjson.c:1184 src/dird/bdirjson.c:1222 src/dird/bdirjson.c:1277 +#: src/dird/bdirjson.c:1185 src/dird/bdirjson.c:1223 src/dird/bdirjson.c:1278 #: src/dird/dird.c:778 src/dird/dird.c:996 src/dird/dird.c:1051 #: src/dird/dird.c:1254 src/filed/bfdjson.c:484 src/filed/bfdjson.c:527 #: src/filed/bfdjson.c:562 src/filed/filed.c:390 src/filed/filed.c:590 @@ -1316,37 +1316,37 @@ msgid "" "\n" msgstr "" -#: src/dird/bdirjson.c:1162 src/dird/dird.c:756 +#: src/dird/bdirjson.c:1163 src/dird/dird.c:756 #, c-format msgid "" "No Director resource defined in %s\n" "Without that I don't know who I am :-(\n" msgstr "" -#: src/dird/bdirjson.c:1170 src/dird/dird.c:764 src/filed/bfdjson.c:477 +#: src/dird/bdirjson.c:1171 src/dird/dird.c:764 src/filed/bfdjson.c:477 #: src/filed/filed.c:352 #, c-format msgid "No Messages resource defined in %s\n" msgstr "" -#: src/dird/bdirjson.c:1175 src/dird/dird.c:769 +#: src/dird/bdirjson.c:1176 src/dird/dird.c:769 #, c-format msgid "Only one Director resource permitted in %s\n" msgstr "" -#: src/dird/bdirjson.c:1192 src/dird/dird.c:786 src/filed/bfdjson.c:537 +#: src/dird/bdirjson.c:1193 src/dird/dird.c:786 src/filed/bfdjson.c:537 #: src/filed/filed.c:600 src/stored/bsdjson.c:607 src/stored/stored.c:447 #, c-format msgid "\"TLS Certificate\" file not defined for Director \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1198 src/dird/dird.c:792 src/filed/bfdjson.c:543 +#: src/dird/bdirjson.c:1199 src/dird/dird.c:792 src/filed/bfdjson.c:543 #: src/filed/filed.c:606 src/stored/bsdjson.c:613 src/stored/stored.c:453 #, c-format msgid "\"TLS Key\" file not defined for Director \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1205 src/dird/dird.c:799 src/filed/bfdjson.c:549 +#: src/dird/bdirjson.c:1206 src/dird/dird.c:799 src/filed/bfdjson.c:549 #: src/filed/filed.c:612 src/stored/bsdjson.c:619 src/stored/stored.c:459 #, c-format msgid "" @@ -1355,19 +1355,19 @@ msgid "" "using \"TLS Verify Peer\".\n" msgstr "" -#: src/dird/bdirjson.c:1231 src/dird/dird.c:1005 src/filed/bfdjson.c:572 +#: src/dird/bdirjson.c:1232 src/dird/dird.c:1005 src/filed/bfdjson.c:572 #: src/filed/filed.c:653 #, c-format msgid "\"TLS Certificate\" file not defined for Console \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1237 src/dird/dird.c:1011 src/filed/bfdjson.c:578 +#: src/dird/bdirjson.c:1238 src/dird/dird.c:1011 src/filed/bfdjson.c:578 #: src/filed/filed.c:659 #, c-format msgid "\"TLS Key\" file not defined for Console \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1244 src/dird/dird.c:1018 src/filed/bfdjson.c:584 +#: src/dird/bdirjson.c:1245 src/dird/dird.c:1018 src/filed/bfdjson.c:584 #: src/filed/filed.c:665 #, c-format msgid "" @@ -1376,40 +1376,40 @@ msgid "" "using \"TLS Verify Peer\".\n" msgstr "" -#: src/dird/bdirjson.c:1261 src/dird/dird.c:1035 src/dird/dird.c:1075 +#: src/dird/bdirjson.c:1262 src/dird/dird.c:1035 src/dird/dird.c:1075 #: src/filed/filed.c:415 #, c-format msgid "Failed to initialize TLS context for File daemon \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1284 src/dird/dird.c:1058 +#: src/dird/bdirjson.c:1285 src/dird/dird.c:1058 #, c-format msgid "" "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for " "File daemon \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1293 src/dird/dird.c:826 +#: src/dird/bdirjson.c:1294 src/dird/dird.c:826 #, c-format msgid "No Job records defined in %s\n" msgstr "" -#: src/dird/bdirjson.c:1353 src/dird/bdirjson.c:1366 src/dird/dird.c:877 +#: src/dird/bdirjson.c:1354 src/dird/bdirjson.c:1367 src/dird/dird.c:877 #: src/dird/dird.c:890 #, c-format msgid "Hey something is wrong. p=0x%lu\n" msgstr "" -#: src/dird/bdirjson.c:1452 src/dird/dird.c:960 +#: src/dird/bdirjson.c:1453 src/dird/dird.c:960 #, c-format msgid "\"%s\" directive in Job \"%s\" resource is required, but not found.\n" msgstr "" -#: src/dird/bdirjson.c:1459 src/dird/dird.c:967 +#: src/dird/bdirjson.c:1460 src/dird/dird.c:967 msgid "Too many items in Job resource\n" msgstr "" -#: src/dird/bdirjson.c:1463 src/dird/dird.c:971 +#: src/dird/bdirjson.c:1464 src/dird/dird.c:971 #, c-format msgid "No storage specified in Job \"%s\" nor in Pool.\n" msgstr "" @@ -3843,11 +3843,11 @@ msgstr "" msgid "Enter base volume name: " msgstr "" -#: src/dird/ua_cmds.c:368 src/dird/ua_label.c:652 +#: src/dird/ua_cmds.c:368 src/dird/ua_label.c:654 msgid "Volume name too long.\n" msgstr "" -#: src/dird/ua_cmds.c:372 src/dird/ua_label.c:658 src/lib/edit.c:519 +#: src/dird/ua_cmds.c:372 src/dird/ua_label.c:660 src/lib/edit.c:519 msgid "Volume name must be at least one character long.\n" msgstr "" @@ -4445,12 +4445,12 @@ msgstr "" msgid "Slot too large.\n" msgstr "" -#: src/dird/ua_label.c:178 src/dird/ua_label.c:356 src/dird/ua_label.c:1185 +#: src/dird/ua_label.c:178 src/dird/ua_label.c:356 src/dird/ua_label.c:1190 #: src/dird/ua_run.c:473 src/dird/ua_run.c:1356 src/dird/ua_run.c:1361 msgid "Command input" msgstr "" -#: src/dird/ua_label.c:196 src/dird/ua_label.c:520 src/dird/ua_label.c:1192 +#: src/dird/ua_label.c:196 src/dird/ua_label.c:520 src/dird/ua_label.c:1197 msgid "No slots in changer to scan.\n" msgstr "" @@ -4458,7 +4458,7 @@ msgstr "" msgid "No Volumes found to label, or no barcodes.\n" msgstr "" -#: src/dird/ua_label.c:218 src/dird/ua_label.c:1213 +#: src/dird/ua_label.c:218 src/dird/ua_label.c:1219 #, c-format msgid "Slot %d greater than max %d ignored.\n" msgstr "" @@ -4558,69 +4558,69 @@ msgstr "" msgid "Catalog error on cleaning tape: %s" msgstr "" -#: src/dird/ua_label.c:645 +#: src/dird/ua_label.c:647 #, c-format msgid "Illegal character \"%c\" in a volume name.\n" msgstr "" -#: src/dird/ua_label.c:693 +#: src/dird/ua_label.c:695 #, c-format msgid "Sending relabel command from \"%s\" to \"%s\" ...\n" msgstr "" -#: src/dird/ua_label.c:700 +#: src/dird/ua_label.c:702 #, c-format msgid "Sending label command for Volume \"%s\" Slot %d ...\n" msgstr "" -#: src/dird/ua_label.c:730 +#: src/dird/ua_label.c:732 #, c-format msgid "Catalog record for Volume \"%s\", Slot %d successfully created.\n" msgstr "" -#: src/dird/ua_label.c:745 +#: src/dird/ua_label.c:747 #, c-format msgid "Label command failed for Volume %s.\n" msgstr "" -#: src/dird/ua_label.c:759 +#: src/dird/ua_label.c:761 msgid "Could not open SD socket.\n" msgstr "" -#: src/dird/ua_label.c:831 src/dird/ua_label.c:841 +#: src/dird/ua_label.c:833 src/dird/ua_label.c:843 #, c-format msgid "Invalid Slot number: %s\n" msgstr "" -#: src/dird/ua_label.c:850 +#: src/dird/ua_label.c:852 #, c-format msgid "Invalid Volume name: %s. Volume skipped.\n" msgstr "" -#: src/dird/ua_label.c:944 +#: src/dird/ua_label.c:946 #, c-format msgid "Device \"%s\" has %d slots.\n" msgstr "" -#: src/dird/ua_label.c:990 +#: src/dird/ua_label.c:995 #, c-format msgid "Pool \"%s\" resource not found for volume \"%s\"!\n" msgstr "" -#: src/dird/ua_label.c:1204 +#: src/dird/ua_label.c:1209 msgid "No Volumes found, or no barcodes.\n" msgstr "" -#: src/dird/ua_label.c:1207 +#: src/dird/ua_label.c:1212 src/dird/ua_label.c:1214 src/dird/ua_label.c:1247 msgid "" -" Slot | Volume Name | Status | Media Type | " -"Pool |\n" +"+------+----------------------+-----------+-----------------" +"+--------------------+\n" msgstr "" -#: src/dird/ua_label.c:1208 +#: src/dird/ua_label.c:1213 msgid "" -"------+------------------+-----------+----------------------" -"+--------------------|\n" +"| Slot | Volume Name | Status | Media Type | " +"Pool |\n" msgstr "" #: src/dird/ua_output.c:57 src/dird/ua_output.c:81 @@ -6929,7 +6929,7 @@ msgstr "" msgid "%d total files; %d marked to be restored; %s bytes.\n" msgstr "" -#: src/dird/ua_tree.c:796 src/stored/btape.c:2961 +#: src/dird/ua_tree.c:796 src/stored/btape.c:2960 #, c-format msgid "" " Command Description\n" @@ -7895,27 +7895,27 @@ msgstr "" msgid "Compression deflateParams error: %d\n" msgstr "" -#: src/filed/backup.c:1105 +#: src/filed/backup.c:1103 #, c-format msgid " Cannot open resource fork for \"%s\": ERR=%s.\n" msgstr "" -#: src/filed/backup.c:1163 +#: src/filed/backup.c:1161 #, c-format msgid "Compression deflate error: %d\n" msgstr "" -#: src/filed/backup.c:1170 +#: src/filed/backup.c:1168 #, c-format msgid "Compression deflateReset error: %d\n" msgstr "" -#: src/filed/backup.c:1212 +#: src/filed/backup.c:1210 #, c-format msgid "Compression LZO error: %d\n" msgstr "" -#: src/filed/backup.c:1422 +#: src/filed/backup.c:1420 #, c-format msgid "VSS Writer (BackupComplete): %s\n" msgstr "" @@ -12424,7 +12424,7 @@ msgstr "" msgid "NULL Volume name. This shouldn't happen!!!\n" msgstr "" -#: src/stored/append.c:123 src/stored/btape.c:2240 +#: src/stored/append.c:123 src/stored/btape.c:2239 #, c-format msgid "Write session label failed. ERR=%s\n" msgstr "" @@ -12464,7 +12464,7 @@ msgstr "" msgid "Set ok=FALSE after write_block_to_device.\n" msgstr "" -#: src/stored/append.c:319 src/stored/btape.c:2359 +#: src/stored/append.c:319 src/stored/btape.c:2358 #, c-format msgid "Error writing end session label. ERR=%s\n" msgstr "" @@ -12483,7 +12483,7 @@ msgstr "" msgid "Error updating file attributes. ERR=%s\n" msgstr "" -#: src/stored/askdir.c:160 src/stored/btape.c:3045 +#: src/stored/askdir.c:160 src/stored/btape.c:3044 #, c-format msgid "Mount Volume \"%s\" on device %s and press return when ready: " msgstr "" @@ -12793,7 +12793,7 @@ msgid "Copy skipped. Record does not match BSR filter.\n" msgstr "" #: src/stored/bcopy.c:270 src/stored/bcopy.c:278 src/stored/bcopy.c:306 -#: src/stored/btape.c:2768 +#: src/stored/btape.c:2767 #, c-format msgid "Cannot fixup device error. %s\n" msgstr "" @@ -13846,7 +13846,7 @@ msgstr "" msgid "Do you want to continue? (y/n): " msgstr "" -#: src/stored/btape.c:751 src/stored/btape.c:2203 +#: src/stored/btape.c:751 src/stored/btape.c:2202 msgid "Command aborted.\n" msgstr "" @@ -13875,13 +13875,13 @@ msgstr "" #: src/stored/btape.c:813 src/stored/btape.c:824 src/stored/btape.c:835 #: src/stored/btape.c:1153 src/stored/btape.c:1169 src/stored/btape.c:1910 -#: src/stored/btape.c:2835 +#: src/stored/btape.c:2834 msgid "Error writing record to block.\n" msgstr "" #: src/stored/btape.c:817 src/stored/btape.c:828 src/stored/btape.c:839 #: src/stored/btape.c:1157 src/stored/btape.c:1173 src/stored/btape.c:1914 -#: src/stored/btape.c:2839 +#: src/stored/btape.c:2838 msgid "Error writing block to device.\n" msgstr "" @@ -13956,7 +13956,7 @@ msgstr "" msgid "Begin writing %i files of %sB with raw blocks of %u bytes.\n" msgstr "" -#: src/stored/btape.c:931 src/stored/btape.c:2891 +#: src/stored/btape.c:931 src/stored/btape.c:2890 #, c-format msgid "Write failed at block %u. stat=%d ERR=%s\n" msgstr "" @@ -14507,7 +14507,7 @@ msgstr "" msgid "Read of %d bytes gives stat=%d. ERR=%s\n" msgstr "" -#: src/stored/btape.c:1970 src/stored/btape.c:2019 +#: src/stored/btape.c:1970 src/stored/btape.c:2018 #, c-format msgid "End of tape\n" msgstr "" @@ -14527,51 +14527,51 @@ msgstr "" msgid "Bad status from read %d. ERR=%s\n" msgstr "" -#: src/stored/btape.c:1985 src/stored/btape.c:1999 src/stored/btape.c:2063 -#: src/stored/btape.c:2075 src/stored/btape.c:2088 src/stored/btape.c:2104 +#: src/stored/btape.c:1985 src/stored/btape.c:1999 src/stored/btape.c:2062 +#: src/stored/btape.c:2074 src/stored/btape.c:2087 src/stored/btape.c:2103 #, c-format msgid "1 block of %d bytes in file %d\n" msgstr "" -#: src/stored/btape.c:1988 src/stored/btape.c:2002 src/stored/btape.c:2066 -#: src/stored/btape.c:2078 src/stored/btape.c:2091 src/stored/btape.c:2107 +#: src/stored/btape.c:1988 src/stored/btape.c:2002 src/stored/btape.c:2065 +#: src/stored/btape.c:2077 src/stored/btape.c:2090 src/stored/btape.c:2106 #, c-format msgid "%d blocks of %d bytes in file %d\n" msgstr "" -#: src/stored/btape.c:2010 src/stored/btape.c:2082 +#: src/stored/btape.c:2010 src/stored/btape.c:2081 #, c-format msgid "End of File mark.\n" msgstr "" -#: src/stored/btape.c:2031 src/stored/btape.c:2135 +#: src/stored/btape.c:2030 src/stored/btape.c:2134 #, c-format msgid "Total files=%d, blocks=%d, bytes = %s\n" msgstr "" -#: src/stored/btape.c:2095 +#: src/stored/btape.c:2094 #, c-format msgid "Short block read.\n" msgstr "" -#: src/stored/btape.c:2098 +#: src/stored/btape.c:2097 #, c-format msgid "Error reading block. ERR=%s\n" msgstr "" -#: src/stored/btape.c:2122 +#: src/stored/btape.c:2121 #, c-format msgid "" "Block=%u file,blk=%u,%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s " "rlen=%d\n" msgstr "" -#: src/stored/btape.c:2144 +#: src/stored/btape.c:2143 #, c-format msgid "Device status: %u. ERR=%s\n" msgstr "" -#: src/stored/btape.c:2176 +#: src/stored/btape.c:2175 #, c-format msgid "" "\n" @@ -14597,79 +14597,79 @@ msgid "" "\n" msgstr "" -#: src/stored/btape.c:2194 +#: src/stored/btape.c:2193 msgid "" "Do you want to run the simplified test (s) with one tape\n" "or the complete multiple tape (m) test: (s/m) " msgstr "" -#: src/stored/btape.c:2197 +#: src/stored/btape.c:2196 msgid "Simple test (single tape) selected.\n" msgstr "" -#: src/stored/btape.c:2200 +#: src/stored/btape.c:2199 msgid "Multiple tape test selected.\n" msgstr "" -#: src/stored/btape.c:2244 +#: src/stored/btape.c:2243 msgid "Wrote Start of Session label.\n" msgstr "" -#: src/stored/btape.c:2263 +#: src/stored/btape.c:2262 #, c-format msgid "%s Begin writing Bacula records to tape ...\n" msgstr "" -#: src/stored/btape.c:2265 +#: src/stored/btape.c:2264 #, c-format msgid "%s Begin writing Bacula records to first tape ...\n" msgstr "" -#: src/stored/btape.c:2291 +#: src/stored/btape.c:2290 msgid "Flush block failed.\n" msgstr "" -#: src/stored/btape.c:2305 +#: src/stored/btape.c:2304 #, c-format msgid "Wrote block=%u, file,blk=%u,%u VolBytes=%s rate=%sB/s\n" msgstr "" -#: src/stored/btape.c:2316 +#: src/stored/btape.c:2315 #, c-format msgid "%s Flush block, write EOF\n" msgstr "" -#: src/stored/btape.c:2325 +#: src/stored/btape.c:2324 msgid "Wrote 1000 blocks on second tape. Done.\n" msgstr "" -#: src/stored/btape.c:2330 +#: src/stored/btape.c:2329 msgid "Not OK\n" msgstr "" -#: src/stored/btape.c:2354 +#: src/stored/btape.c:2353 msgid "Job canceled.\n" msgstr "" -#: src/stored/btape.c:2365 +#: src/stored/btape.c:2364 msgid "Set ok=false after write_block_to_device.\n" msgstr "" -#: src/stored/btape.c:2369 +#: src/stored/btape.c:2368 msgid "Wrote End of Session label.\n" msgstr "" -#: src/stored/btape.c:2392 +#: src/stored/btape.c:2391 #, c-format msgid "Wrote state file last_block_num1=%d last_block_num2=%d\n" msgstr "" -#: src/stored/btape.c:2396 +#: src/stored/btape.c:2395 #, c-format msgid "Could not create state file: %s ERR=%s\n" msgstr "" -#: src/stored/btape.c:2407 +#: src/stored/btape.c:2406 #, c-format msgid "" "\n" @@ -14677,7 +14677,7 @@ msgid "" "%s Done filling tape at %d:%d. Now beginning re-read of tape ...\n" msgstr "" -#: src/stored/btape.c:2410 +#: src/stored/btape.c:2409 #, c-format msgid "" "\n" @@ -14685,23 +14685,23 @@ msgid "" "%s Done filling tapes at %d:%d. Now beginning re-read of first tape ...\n" msgstr "" -#: src/stored/btape.c:2416 +#: src/stored/btape.c:2415 msgid "do_unfill failed.\n" msgstr "" -#: src/stored/btape.c:2421 +#: src/stored/btape.c:2420 #, c-format msgid "%s: Error during test.\n" msgstr "" -#: src/stored/btape.c:2456 +#: src/stored/btape.c:2455 msgid "" "\n" "The state file level has changed. You must redo\n" "the fill command.\n" msgstr "" -#: src/stored/btape.c:2463 +#: src/stored/btape.c:2462 #, c-format msgid "" "\n" @@ -14709,95 +14709,95 @@ msgid "" "You must redo the fill command.\n" msgstr "" -#: src/stored/btape.c:2529 +#: src/stored/btape.c:2528 msgid "Mount first tape. Press enter when ready: " msgstr "" -#: src/stored/btape.c:2546 +#: src/stored/btape.c:2545 msgid "Rewinding.\n" msgstr "" -#: src/stored/btape.c:2551 +#: src/stored/btape.c:2550 #, c-format msgid "Reading the first 10000 records from %u:%u.\n" msgstr "" -#: src/stored/btape.c:2555 src/stored/btape.c:2627 +#: src/stored/btape.c:2554 src/stored/btape.c:2626 #, c-format msgid "Reposition from %u:%u to %u:%u\n" msgstr "" -#: src/stored/btape.c:2560 src/stored/btape.c:2614 src/stored/btape.c:2632 +#: src/stored/btape.c:2559 src/stored/btape.c:2613 src/stored/btape.c:2631 #, c-format msgid "Reposition error. ERR=%s\n" msgstr "" -#: src/stored/btape.c:2563 +#: src/stored/btape.c:2562 #, c-format msgid "Reading block %u.\n" msgstr "" -#: src/stored/btape.c:2565 src/stored/btape.c:2619 src/stored/btape.c:2637 +#: src/stored/btape.c:2564 src/stored/btape.c:2618 src/stored/btape.c:2636 #, c-format msgid "Error reading block: ERR=%s\n" msgstr "" -#: src/stored/btape.c:2570 +#: src/stored/btape.c:2569 msgid "" "\n" "The last block on the tape matches. Test succeeded.\n" "\n" msgstr "" -#: src/stored/btape.c:2573 +#: src/stored/btape.c:2572 msgid "" "\n" "The last block of the first tape matches.\n" "\n" msgstr "" -#: src/stored/btape.c:2597 +#: src/stored/btape.c:2596 msgid "Mount second tape. Press enter when ready: " msgstr "" -#: src/stored/btape.c:2611 +#: src/stored/btape.c:2610 #, c-format msgid "Reposition from %u:%u to 0:1\n" msgstr "" -#: src/stored/btape.c:2617 src/stored/btape.c:2635 +#: src/stored/btape.c:2616 src/stored/btape.c:2634 #, c-format msgid "Reading block %d.\n" msgstr "" -#: src/stored/btape.c:2623 +#: src/stored/btape.c:2622 msgid "" "\n" "The first block on the second tape matches.\n" "\n" msgstr "" -#: src/stored/btape.c:2641 +#: src/stored/btape.c:2640 msgid "" "\n" "The last block on the second tape matches. Test succeeded.\n" "\n" msgstr "" -#: src/stored/btape.c:2659 +#: src/stored/btape.c:2658 #, c-format msgid "10000 records read now at %d:%d\n" msgstr "" -#: src/stored/btape.c:2685 src/stored/btape.c:2696 src/stored/btape.c:2741 +#: src/stored/btape.c:2684 src/stored/btape.c:2695 src/stored/btape.c:2740 msgid "Last block written" msgstr "" -#: src/stored/btape.c:2687 src/stored/btape.c:2697 +#: src/stored/btape.c:2686 src/stored/btape.c:2696 msgid "Block read back" msgstr "" -#: src/stored/btape.c:2688 +#: src/stored/btape.c:2687 #, c-format msgid "" "\n" @@ -14805,7 +14805,7 @@ msgid "" "The blocks differ at byte %u\n" msgstr "" -#: src/stored/btape.c:2689 +#: src/stored/btape.c:2688 msgid "" "\n" "\n" @@ -14815,172 +14815,172 @@ msgid "" "to write multi-tape Volumes.!!!!\n" msgstr "" -#: src/stored/btape.c:2725 +#: src/stored/btape.c:2724 #, c-format msgid "Last block at: %u:%u this_dev_block_num=%d\n" msgstr "" -#: src/stored/btape.c:2739 +#: src/stored/btape.c:2738 #, c-format msgid "Block not written: FileIndex=%u blk_block=%u Size=%u\n" msgstr "" -#: src/stored/btape.c:2743 +#: src/stored/btape.c:2742 msgid "Block not written" msgstr "" -#: src/stored/btape.c:2758 +#: src/stored/btape.c:2757 #, c-format msgid "End of tape %d:%d. Volume Bytes=%s. Write rate = %sB/s\n" msgstr "" -#: src/stored/btape.c:2809 +#: src/stored/btape.c:2808 msgid "Test writing blocks of 64512 bytes to tape.\n" msgstr "" -#: src/stored/btape.c:2811 +#: src/stored/btape.c:2810 msgid "How many blocks do you want to write? (1000): " msgstr "" -#: src/stored/btape.c:2828 +#: src/stored/btape.c:2827 #, c-format msgid "Begin writing %d Bacula blocks to tape ...\n" msgstr "" -#: src/stored/btape.c:2871 +#: src/stored/btape.c:2870 #, c-format msgid "Begin writing raw blocks of %u bytes.\n" msgstr "" -#: src/stored/btape.c:2902 +#: src/stored/btape.c:2901 msgid "test autochanger" msgstr "" -#: src/stored/btape.c:2903 +#: src/stored/btape.c:2902 msgid "backspace file" msgstr "" -#: src/stored/btape.c:2904 +#: src/stored/btape.c:2903 msgid "backspace record" msgstr "" -#: src/stored/btape.c:2905 +#: src/stored/btape.c:2904 msgid "list device capabilities" msgstr "" -#: src/stored/btape.c:2906 +#: src/stored/btape.c:2905 msgid "clear tape errors" msgstr "" -#: src/stored/btape.c:2907 +#: src/stored/btape.c:2906 msgid "go to end of Bacula data for append" msgstr "" -#: src/stored/btape.c:2908 +#: src/stored/btape.c:2907 msgid "go to the physical end of medium" msgstr "" -#: src/stored/btape.c:2909 +#: src/stored/btape.c:2908 msgid "fill tape, write onto second volume" msgstr "" -#: src/stored/btape.c:2910 +#: src/stored/btape.c:2909 msgid "read filled tape" msgstr "" -#: src/stored/btape.c:2911 +#: src/stored/btape.c:2910 msgid "forward space a file" msgstr "" -#: src/stored/btape.c:2912 +#: src/stored/btape.c:2911 msgid "forward space a record" msgstr "" -#: src/stored/btape.c:2913 +#: src/stored/btape.c:2912 msgid "print this command" msgstr "" -#: src/stored/btape.c:2914 +#: src/stored/btape.c:2913 msgid "write a Bacula label to the tape" msgstr "" -#: src/stored/btape.c:2915 +#: src/stored/btape.c:2914 msgid "load a tape" msgstr "" -#: src/stored/btape.c:2916 +#: src/stored/btape.c:2915 msgid "quit btape" msgstr "" -#: src/stored/btape.c:2917 +#: src/stored/btape.c:2916 msgid "use write() to fill tape" msgstr "" -#: src/stored/btape.c:2918 +#: src/stored/btape.c:2917 msgid "read and print the Bacula tape label" msgstr "" -#: src/stored/btape.c:2919 +#: src/stored/btape.c:2918 msgid "test record handling functions" msgstr "" -#: src/stored/btape.c:2920 +#: src/stored/btape.c:2919 msgid "rewind the tape" msgstr "" -#: src/stored/btape.c:2921 +#: src/stored/btape.c:2920 msgid "read() tape block by block to EOT and report" msgstr "" -#: src/stored/btape.c:2922 +#: src/stored/btape.c:2921 msgid "Bacula read block by block to EOT and report" msgstr "" -#: src/stored/btape.c:2923 +#: src/stored/btape.c:2922 msgid "" "[file_size=n(GB)|nb_file=3|skip_zero|skip_random|skip_raw|skip_block] report " "drive speed" msgstr "" -#: src/stored/btape.c:2924 +#: src/stored/btape.c:2923 msgid "print tape status" msgstr "" -#: src/stored/btape.c:2925 +#: src/stored/btape.c:2924 msgid "General test Bacula tape functions" msgstr "" -#: src/stored/btape.c:2926 +#: src/stored/btape.c:2925 msgid "write an EOF on the tape" msgstr "" -#: src/stored/btape.c:2927 +#: src/stored/btape.c:2926 msgid "write a single Bacula block" msgstr "" -#: src/stored/btape.c:2928 +#: src/stored/btape.c:2927 msgid "read a single record" msgstr "" -#: src/stored/btape.c:2929 +#: src/stored/btape.c:2928 msgid "read a single Bacula block" msgstr "" -#: src/stored/btape.c:2930 +#: src/stored/btape.c:2929 msgid "quick fill command" msgstr "" -#: src/stored/btape.c:2951 +#: src/stored/btape.c:2950 #, c-format msgid "\"%s\" is an invalid command\n" msgstr "" -#: src/stored/btape.c:2960 +#: src/stored/btape.c:2959 #, c-format msgid "Interactive commands:\n" msgstr "" -#: src/stored/btape.c:2971 +#: src/stored/btape.c:2970 #, c-format msgid "" "\n" @@ -14999,27 +14999,27 @@ msgid "" "\n" msgstr "" -#: src/stored/btape.c:3042 +#: src/stored/btape.c:3041 #, c-format msgid "Mount second Volume on device %s and press return when ready: " msgstr "" -#: src/stored/btape.c:3070 +#: src/stored/btape.c:3069 #, c-format msgid "Mount blank Volume on device %s and press return when ready: " msgstr "" -#: src/stored/btape.c:3090 +#: src/stored/btape.c:3089 #, c-format msgid "End of Volume \"%s\" %d records.\n" msgstr "" -#: src/stored/btape.c:3104 +#: src/stored/btape.c:3103 #, c-format msgid "Read block=%u, VolBytes=%s rate=%sB/s\n" msgstr "" -#: src/stored/btape.c:3117 +#: src/stored/btape.c:3116 #, c-format msgid "Cannot open Dev=%s, Vol=%s\n" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: bacula 3.0.3\n" "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-06-30 08:32+0200\n" +"POT-Creation-Date: 2017-07-23 18:30+0200\n" "PO-Revision-Date: 2010-01-08 17:32+0300\n" "Last-Translator: Vitaliy Kosharskiy <kisa_co@ukrpost.net>\n" "Language-Team: Ukrainian\n" @@ -41,8 +41,8 @@ msgstr "" msgid "*None*" msgstr "" -#: src/cats/cats.c:137 src/cats/mysql.c:487 src/cats/postgresql.c:583 -#: src/cats/postgresql.c:634 src/cats/sqlite.c:488 +#: src/cats/cats.c:137 src/cats/mysql.c:488 src/cats/postgresql.c:606 +#: src/cats/postgresql.c:657 src/cats/sqlite.c:488 #, fuzzy, c-format msgid "Query failed: %s: ERR=%s\n" msgstr "Помилка у %s файл %s: ERR=%s\n" @@ -55,12 +55,12 @@ msgstr "" msgid "A user name for MySQL must be supplied.\n" msgstr "" -#: src/cats/mysql.c:210 src/cats/postgresql.c:247 src/cats/sqlite.c:184 +#: src/cats/mysql.c:211 src/cats/postgresql.c:256 src/cats/sqlite.c:184 #, fuzzy, c-format msgid "Unable to initialize DB lock. ERR=%s\n" msgstr "Не можливо встановити власника файлу %s: ERR=%s\n" -#: src/cats/mysql.c:267 +#: src/cats/mysql.c:268 #, c-format msgid "" "Unable to connect to MySQL server.\n" @@ -69,17 +69,17 @@ msgid "" "incorrect.\n" msgstr "" -#: src/cats/mysql.c:463 src/cats/postgresql.c:529 src/cats/sqlite.c:411 +#: src/cats/mysql.c:464 src/cats/postgresql.c:552 src/cats/sqlite.c:411 #: src/dird/fd_cmds.c:960 src/dird/fd_cmds.c:1021 #, fuzzy, c-format msgid "Attribute create error. %s" msgstr "Не вдалось створити %s: ERR=%s\n" -#: src/cats/postgresql.c:110 +#: src/cats/postgresql.c:119 msgid "A user name for PostgreSQL must be supplied.\n" msgstr "" -#: src/cats/postgresql.c:205 src/cats/sql.c:531 src/cats/sql.c:538 +#: src/cats/postgresql.c:214 src/cats/sql.c:531 src/cats/sql.c:538 #: src/cats/sql_create.c:559 src/cats/sql_get.c:191 src/cats/sql_get.c:242 #: src/cats/sql_get.c:613 src/cats/sql_get.c:824 src/cats/sql_get.c:1152 #: src/cats/sql_get.c:1543 src/cats/sql_get.c:1695 @@ -87,12 +87,12 @@ msgstr "" msgid "error fetching row: %s\n" msgstr "Помилка у %s: ERR=%s\n" -#: src/cats/postgresql.c:217 +#: src/cats/postgresql.c:226 #, c-format msgid "Encoding error for database \"%s\". Wanted SQL_ASCII, got %s\n" msgstr "" -#: src/cats/postgresql.c:307 +#: src/cats/postgresql.c:330 #, c-format msgid "" "Unable to connect to PostgreSQL server. Database=%s User=%s\n" @@ -100,39 +100,39 @@ msgid "" "exceeded.\n" msgstr "" -#: src/cats/postgresql.c:423 +#: src/cats/postgresql.c:446 msgid "PQescapeStringConn returned non-zero.\n" msgstr "" -#: src/cats/postgresql.c:443 +#: src/cats/postgresql.c:466 msgid "PQescapeByteaConn returned NULL.\n" msgstr "" -#: src/cats/postgresql.c:472 +#: src/cats/postgresql.c:495 msgid "PQunescapeByteaConn returned NULL.\n" msgstr "" -#: src/cats/postgresql.c:590 +#: src/cats/postgresql.c:613 #, fuzzy, c-format msgid "Fetch failed: ERR=%s\n" msgstr "Помилка у %s файл %s: ERR=%s\n" -#: src/cats/postgresql.c:883 +#: src/cats/postgresql.c:906 #, c-format msgid "error fetching currval: %s\n" msgstr "" -#: src/cats/postgresql.c:1064 +#: src/cats/postgresql.c:1087 #, c-format msgid "error starting batch mode: %s" msgstr "" -#: src/cats/postgresql.c:1094 src/cats/postgresql.c:1101 +#: src/cats/postgresql.c:1117 src/cats/postgresql.c:1124 #, fuzzy, c-format msgid "error ending batch mode: %s" msgstr "Помилка надсилання Hello до Збирача. ERR=%s\n" -#: src/cats/postgresql.c:1151 +#: src/cats/postgresql.c:1174 #, c-format msgid "error copying in batch mode: %s" msgstr "" @@ -735,7 +735,7 @@ msgstr "Будьласка виправте файл конфігурації: % #: src/console/bbconsjson.c:432 src/console/bbconsjson.c:463 #: src/console/console.c:1422 src/console/console.c:1452 -#: src/dird/bdirjson.c:1184 src/dird/bdirjson.c:1222 src/dird/bdirjson.c:1277 +#: src/dird/bdirjson.c:1185 src/dird/bdirjson.c:1223 src/dird/bdirjson.c:1278 #: src/dird/dird.c:778 src/dird/dird.c:996 src/dird/dird.c:1051 #: src/dird/dird.c:1254 src/filed/bfdjson.c:484 src/filed/bfdjson.c:527 #: src/filed/bfdjson.c:562 src/filed/filed.c:390 src/filed/filed.c:590 @@ -1363,7 +1363,7 @@ msgstr "" " -? print this message.\n" "\n" -#: src/dird/bdirjson.c:1162 src/dird/dird.c:756 +#: src/dird/bdirjson.c:1163 src/dird/dird.c:756 #, fuzzy, c-format msgid "" "No Director resource defined in %s\n" @@ -1372,18 +1372,18 @@ msgstr "" "У %s не задано ресурсу Керівника\n" "Без цього я не знаю як спілкуватись із Керівником :-(\n" -#: src/dird/bdirjson.c:1170 src/dird/dird.c:764 src/filed/bfdjson.c:477 +#: src/dird/bdirjson.c:1171 src/dird/dird.c:764 src/filed/bfdjson.c:477 #: src/filed/filed.c:352 #, fuzzy, c-format msgid "No Messages resource defined in %s\n" msgstr "Ресурс %s не визначено\n" -#: src/dird/bdirjson.c:1175 src/dird/dird.c:769 +#: src/dird/bdirjson.c:1176 src/dird/dird.c:769 #, c-format msgid "Only one Director resource permitted in %s\n" msgstr "" -#: src/dird/bdirjson.c:1192 src/dird/dird.c:786 src/filed/bfdjson.c:537 +#: src/dird/bdirjson.c:1193 src/dird/dird.c:786 src/filed/bfdjson.c:537 #: src/filed/filed.c:600 src/stored/bsdjson.c:607 src/stored/stored.c:447 #, fuzzy, c-format msgid "\"TLS Certificate\" file not defined for Director \"%s\" in %s.\n" @@ -1391,13 +1391,13 @@ msgstr "" "Жоден із параметрів \"TLS CA Certificate\" або \"TLS CA Certificate Dir\" не " "задано для Консолі \"%s\" у %s.\n" -#: src/dird/bdirjson.c:1198 src/dird/dird.c:792 src/filed/bfdjson.c:543 +#: src/dird/bdirjson.c:1199 src/dird/dird.c:792 src/filed/bfdjson.c:543 #: src/filed/filed.c:606 src/stored/bsdjson.c:613 src/stored/stored.c:453 #, c-format msgid "\"TLS Key\" file not defined for Director \"%s\" in %s.\n" msgstr "" -#: src/dird/bdirjson.c:1205 src/dird/dird.c:799 src/filed/bfdjson.c:549 +#: src/dird/bdirjson.c:1206 src/dird/dird.c:799 src/filed/bfdjson.c:549 #: src/filed/filed.c:612 src/stored/bsdjson.c:619 src/stored/stored.c:459 #, fuzzy, c-format msgid "" @@ -1409,7 +1409,7 @@ msgstr "" "задано для Керівника \"%s\" у %s. Необхідне щонайменше одне сховище для " "сертифікату CA.\n" -#: src/dird/bdirjson.c:1231 src/dird/dird.c:1005 src/filed/bfdjson.c:572 +#: src/dird/bdirjson.c:1232 src/dird/dird.c:1005 src/filed/bfdjson.c:572 #: src/filed/filed.c:653 #, fuzzy, c-format msgid "\"TLS Certificate\" file not defined for Console \"%s\" in %s.\n" @@ -1417,7 +1417,7 @@ msgstr "" "Жоден із параметрів \"TLS CA Certificate\" або \"TLS CA Certificate Dir\" не " "задано для Консолі \"%s\" у %s.\n" -#: src/dird/bdirjson.c:1237 src/dird/dird.c:1011 src/filed/bfdjson.c:578 +#: src/dird/bdirjson.c:1238 src/dird/dird.c:1011 src/filed/bfdjson.c:578 #: src/filed/filed.c:659 #, fuzzy, c-format msgid "\"TLS Key\" file not defined for Console \"%s\" in %s.\n" @@ -1425,7 +1425,7 @@ msgstr "" "Жоден із параметрів \"TLS CA Certificate\" або \"TLS CA Certificate Dir\" не " "задано для Консолі \"%s\" у %s.\n" -#: src/dird/bdirjson.c:1244 src/dird/dird.c:1018 src/filed/bfdjson.c:584 +#: src/dird/bdirjson.c:1245 src/dird/dird.c:1018 src/filed/bfdjson.c:584 #: src/filed/filed.c:665 #, fuzzy, c-format msgid "" @@ -1437,13 +1437,13 @@ msgstr "" "задано для Керівника \"%s\" у %s. Необхідне щонайменше одне сховище для " "сертифікату CA.\n" -#: src/dird/bdirjson.c:1261 src/dird/dird.c:1035 src/dird/dird.c:1075 +#: src/dird/bdirjson.c:1262 src/dird/dird.c:1035 src/dird/dird.c:1075 #: src/filed/filed.c:415 #, fuzzy, c-format msgid "Failed to initialize TLS context for File daemon \"%s\" in %s.\n" msgstr "Ініціалізація контексту TLS для Керівника невдала \"%s\".\n" -#: src/dird/bdirjson.c:1284 src/dird/dird.c:1058 +#: src/dird/bdirjson.c:1285 src/dird/dird.c:1058 #, fuzzy, c-format msgid "" "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for " @@ -1452,28 +1452,28 @@ msgstr "" "Жоден із параметрів \"TLS CA Certificate\" або \"TLS CA Certificate Dir\" не " "задано для Консолі \"%s\" у %s.\n" -#: src/dird/bdirjson.c:1293 src/dird/dird.c:826 +#: src/dird/bdirjson.c:1294 src/dird/dird.c:826 #, fuzzy, c-format msgid "No Job records defined in %s\n" msgstr "Ресурс %s не визначено\n" -#: src/dird/bdirjson.c:1353 src/dird/bdirjson.c:1366 src/dird/dird.c:877 +#: src/dird/bdirjson.c:1354 src/dird/bdirjson.c:1367 src/dird/dird.c:877 #: src/dird/dird.c:890 #, c-format msgid "Hey something is wrong. p=0x%lu\n" msgstr "" -#: src/dird/bdirjson.c:1452 src/dird/dird.c:960 +#: src/dird/bdirjson.c:1453 src/dird/dird.c:960 #, fuzzy, c-format msgid "\"%s\" directive in Job \"%s\" resource is required, but not found.\n" msgstr "Не знайдено необхідний елемент %s для ресурсу %s.\n" -#: src/dird/bdirjson.c:1459 src/dird/dird.c:967 +#: src/dird/bdirjson.c:1460 src/dird/dird.c:967 #, fuzzy msgid "Too many items in Job resource\n" msgstr "Забагато елементів у ресурсі %s\n" -#: src/dird/bdirjson.c:1463 src/dird/dird.c:971 +#: src/dird/bdirjson.c:1464 src/dird/dird.c:971 #, c-format msgid "No storage specified in Job \"%s\" nor in Pool.\n" msgstr "" @@ -3953,11 +3953,11 @@ msgstr "" msgid "Enter base volume name: " msgstr "" -#: src/dird/ua_cmds.c:368 src/dird/ua_label.c:652 +#: src/dird/ua_cmds.c:368 src/dird/ua_label.c:654 msgid "Volume name too long.\n" msgstr "" -#: src/dird/ua_cmds.c:372 src/dird/ua_label.c:658 src/lib/edit.c:519 +#: src/dird/ua_cmds.c:372 src/dird/ua_label.c:660 src/lib/edit.c:519 msgid "Volume name must be at least one character long.\n" msgstr "" @@ -4572,13 +4572,13 @@ msgstr "" msgid "Slot too large.\n" msgstr "" -#: src/dird/ua_label.c:178 src/dird/ua_label.c:356 src/dird/ua_label.c:1185 +#: src/dird/ua_label.c:178 src/dird/ua_label.c:356 src/dird/ua_label.c:1190 #: src/dird/ua_run.c:473 src/dird/ua_run.c:1356 src/dird/ua_run.c:1361 #, fuzzy msgid "Command input" msgstr "Не зрозумілий параметр командного рядка" -#: src/dird/ua_label.c:196 src/dird/ua_label.c:520 src/dird/ua_label.c:1192 +#: src/dird/ua_label.c:196 src/dird/ua_label.c:520 src/dird/ua_label.c:1197 msgid "No slots in changer to scan.\n" msgstr "" @@ -4586,7 +4586,7 @@ msgstr "" msgid "No Volumes found to label, or no barcodes.\n" msgstr "" -#: src/dird/ua_label.c:218 src/dird/ua_label.c:1213 +#: src/dird/ua_label.c:218 src/dird/ua_label.c:1219 #, c-format msgid "Slot %d greater than max %d ignored.\n" msgstr "" @@ -4686,70 +4686,70 @@ msgstr "" msgid "Catalog error on cleaning tape: %s" msgstr "Помилка під час оновлення відбитку файлу. %s" -#: src/dird/ua_label.c:645 +#: src/dird/ua_label.c:647 #, fuzzy, c-format msgid "Illegal character \"%c\" in a volume name.\n" msgstr "Заборонені символи у назві Тому \"%s\"\n" -#: src/dird/ua_label.c:693 +#: src/dird/ua_label.c:695 #, c-format msgid "Sending relabel command from \"%s\" to \"%s\" ...\n" msgstr "" -#: src/dird/ua_label.c:700 +#: src/dird/ua_label.c:702 #, fuzzy, c-format msgid "Sending label command for Volume \"%s\" Slot %d ...\n" msgstr "Заборонені символи у назві Тому \"%s\"\n" -#: src/dird/ua_label.c:730 +#: src/dird/ua_label.c:732 #, fuzzy, c-format msgid "Catalog record for Volume \"%s\", Slot %d successfully created.\n" msgstr "Заборонені символи у назві Тому \"%s\"\n" -#: src/dird/ua_label.c:745 +#: src/dird/ua_label.c:747 #, c-format msgid "Label command failed for Volume %s.\n" msgstr "" -#: src/dird/ua_label.c:759 +#: src/dird/ua_label.c:761 #, fuzzy msgid "Could not open SD socket.\n" msgstr "Не вдалось відкрити%s: ERR=%s\n" -#: src/dird/ua_label.c:831 src/dird/ua_label.c:841 +#: src/dird/ua_label.c:833 src/dird/ua_label.c:843 #, c-format msgid "Invalid Slot number: %s\n" msgstr "" -#: src/dird/ua_label.c:850 +#: src/dird/ua_label.c:852 #, c-format msgid "Invalid Volume name: %s. Volume skipped.\n" msgstr "" -#: src/dird/ua_label.c:944 +#: src/dird/ua_label.c:946 #, c-format msgid "Device \"%s\" has %d slots.\n" msgstr "" -#: src/dird/ua_label.c:990 +#: src/dird/ua_label.c:995 #, c-format msgid "Pool \"%s\" resource not found for volume \"%s\"!\n" msgstr "" -#: src/dird/ua_label.c:1204 +#: src/dird/ua_label.c:1209 msgid "No Volumes found, or no barcodes.\n" msgstr "" -#: src/dird/ua_label.c:1207 +#: src/dird/ua_label.c:1212 src/dird/ua_label.c:1214 src/dird/ua_label.c:1247 msgid "" -" Slot | Volume Name | Status | Media Type | " -"Pool |\n" +"+------+----------------------+-----------+-----------------" +"+--------------------+\n" msgstr "" -#: src/dird/ua_label.c:1208 +#: src/dird/ua_label.c:1213 msgid "" -"------+------------------+-----------+----------------------" -"+--------------------|\n" +"| Slot | Volume Name | Status | Media Type | " +"Pool |\n" msgstr "" #: src/dird/ua_output.c:57 src/dird/ua_output.c:81 @@ -7149,7 +7149,7 @@ msgstr "" msgid "%d total files; %d marked to be restored; %s bytes.\n" msgstr "" -#: src/dird/ua_tree.c:796 src/stored/btape.c:2961 +#: src/dird/ua_tree.c:796 src/stored/btape.c:2960 #, c-format msgid "" " Command Description\n" @@ -8137,27 +8137,27 @@ msgstr "Помилка у %s файл %s: ERR=%s\n" msgid "Compression deflateParams error: %d\n" msgstr "" -#: src/filed/backup.c:1105 +#: src/filed/backup.c:1103 #, fuzzy, c-format msgid " Cannot open resource fork for \"%s\": ERR=%s.\n" msgstr "Не вдається відкрити файл %s для виведення. ERR=%s\n" -#: src/filed/backup.c:1163 +#: src/filed/backup.c:1161 #, c-format msgid "Compression deflate error: %d\n" msgstr "" -#: src/filed/backup.c:1170 +#: src/filed/backup.c:1168 #, c-format msgid "Compression deflateReset error: %d\n" msgstr "" -#: src/filed/backup.c:1212 +#: src/filed/backup.c:1210 #, c-format msgid "Compression LZO error: %d\n" msgstr "" -#: src/filed/backup.c:1422 +#: src/filed/backup.c:1420 #, c-format msgid "VSS Writer (BackupComplete): %s\n" msgstr "" @@ -12852,7 +12852,7 @@ msgstr "Не вдалось відновити прапорці для файл msgid "NULL Volume name. This shouldn't happen!!!\n" msgstr "" -#: src/stored/append.c:123 src/stored/btape.c:2240 +#: src/stored/append.c:123 src/stored/btape.c:2239 #, fuzzy, c-format msgid "Write session label failed. ERR=%s\n" msgstr "Помилка надсилання Hello до Збирача. ERR=%s\n" @@ -12892,7 +12892,7 @@ msgstr "Помилка у %s файл %s: ERR=%s\n" msgid "Set ok=FALSE after write_block_to_device.\n" msgstr "" -#: src/stored/append.c:319 src/stored/btape.c:2359 +#: src/stored/append.c:319 src/stored/btape.c:2358 #, fuzzy, c-format msgid "Error writing end session label. ERR=%s\n" msgstr "Помилка надсилання Hello до Збирача. ERR=%s\n" @@ -12911,7 +12911,7 @@ msgstr "" msgid "Error updating file attributes. ERR=%s\n" msgstr "Помилка у %s файл %s: ERR=%s\n" -#: src/stored/askdir.c:160 src/stored/btape.c:3045 +#: src/stored/askdir.c:160 src/stored/btape.c:3044 #, c-format msgid "Mount Volume \"%s\" on device %s and press return when ready: " msgstr "" @@ -13235,7 +13235,7 @@ msgid "Copy skipped. Record does not match BSR filter.\n" msgstr "" #: src/stored/bcopy.c:270 src/stored/bcopy.c:278 src/stored/bcopy.c:306 -#: src/stored/btape.c:2768 +#: src/stored/btape.c:2767 #, fuzzy, c-format msgid "Cannot fixup device error. %s\n" msgstr "Не вдається відкрити файл %s для виведення. ERR=%s\n" @@ -14347,7 +14347,7 @@ msgstr "" msgid "Do you want to continue? (y/n): " msgstr "" -#: src/stored/btape.c:751 src/stored/btape.c:2203 +#: src/stored/btape.c:751 src/stored/btape.c:2202 #, fuzzy msgid "Command aborted.\n" msgstr "Помилка команди" @@ -14377,14 +14377,14 @@ msgstr "" #: src/stored/btape.c:813 src/stored/btape.c:824 src/stored/btape.c:835 #: src/stored/btape.c:1153 src/stored/btape.c:1169 src/stored/btape.c:1910 -#: src/stored/btape.c:2835 +#: src/stored/btape.c:2834 #, fuzzy msgid "Error writing record to block.\n" msgstr "Помилка надсилання Hello до Збирача. ERR=%s\n" #: src/stored/btape.c:817 src/stored/btape.c:828 src/stored/btape.c:839 #: src/stored/btape.c:1157 src/stored/btape.c:1173 src/stored/btape.c:1914 -#: src/stored/btape.c:2839 +#: src/stored/btape.c:2838 #, fuzzy msgid "Error writing block to device.\n" msgstr "Помилка надсилання Hello до Збирача. ERR=%s\n" @@ -14460,7 +14460,7 @@ msgstr "" msgid "Begin writing %i files of %sB with raw blocks of %u bytes.\n" msgstr "" -#: src/stored/btape.c:931 src/stored/btape.c:2891 +#: src/stored/btape.c:931 src/stored/btape.c:2890 #, fuzzy, c-format msgid "Write failed at block %u. stat=%d ERR=%s\n" msgstr "Помилка у %s файл %s: ERR=%s\n" @@ -15013,7 +15013,7 @@ msgstr "" msgid "Read of %d bytes gives stat=%d. ERR=%s\n" msgstr "" -#: src/stored/btape.c:1970 src/stored/btape.c:2019 +#: src/stored/btape.c:1970 src/stored/btape.c:2018 #, c-format msgid "End of tape\n" msgstr "" @@ -15033,51 +15033,51 @@ msgstr "Помилка у %s файл %s: ERR=%s\n" msgid "Bad status from read %d. ERR=%s\n" msgstr "Не можливо встановити власника файлу %s: ERR=%s\n" -#: src/stored/btape.c:1985 src/stored/btape.c:1999 src/stored/btape.c:2063 -#: src/stored/btape.c:2075 src/stored/btape.c:2088 src/stored/btape.c:2104 +#: src/stored/btape.c:1985 src/stored/btape.c:1999 src/stored/btape.c:2062 +#: src/stored/btape.c:2074 src/stored/btape.c:2087 src/stored/btape.c:2103 #, c-format msgid "1 block of %d bytes in file %d\n" msgstr "" -#: src/stored/btape.c:1988 src/stored/btape.c:2002 src/stored/btape.c:2066 -#: src/stored/btape.c:2078 src/stored/btape.c:2091 src/stored/btape.c:2107 +#: src/stored/btape.c:1988 src/stored/btape.c:2002 src/stored/btape.c:2065 +#: src/stored/btape.c:2077 src/stored/btape.c:2090 src/stored/btape.c:2106 #, c-format msgid "%d blocks of %d bytes in file %d\n" msgstr "" -#: src/stored/btape.c:2010 src/stored/btape.c:2082 +#: src/stored/btape.c:2010 src/stored/btape.c:2081 #, c-format msgid "End of File mark.\n" msgstr "" -#: src/stored/btape.c:2031 src/stored/btape.c:2135 +#: src/stored/btape.c:2030 src/stored/btape.c:2134 #, c-format msgid "Total files=%d, blocks=%d, bytes = %s\n" msgstr "" -#: src/stored/btape.c:2095 +#: src/stored/btape.c:2094 #, c-format msgid "Short block read.\n" msgstr "" -#: src/stored/btape.c:2098 +#: src/stored/btape.c:2097 #, fuzzy, c-format msgid "Error reading block. ERR=%s\n" msgstr "Помилка у %s: ERR=%s\n" -#: src/stored/btape.c:2122 +#: src/stored/btape.c:2121 #, c-format msgid "" "Block=%u file,blk=%u,%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s " "rlen=%d\n" msgstr "" -#: src/stored/btape.c:2144 +#: src/stored/btape.c:2143 #, c-format msgid "Device status: %u. ERR=%s\n" msgstr "" -#: src/stored/btape.c:2176 +#: src/stored/btape.c:2175 #, c-format msgid "" "\n" @@ -15103,82 +15103,82 @@ msgid "" "\n" msgstr "" -#: src/stored/btape.c:2194 +#: src/stored/btape.c:2193 msgid "" "Do you want to run the simplified test (s) with one tape\n" "or the complete multiple tape (m) test: (s/m) " msgstr "" -#: src/stored/btape.c:2197 +#: src/stored/btape.c:2196 msgid "Simple test (single tape) selected.\n" msgstr "" -#: src/stored/btape.c:2200 +#: src/stored/btape.c:2199 msgid "Multiple tape test selected.\n" msgstr "" -#: src/stored/btape.c:2244 +#: src/stored/btape.c:2243 #, fuzzy msgid "Wrote Start of Session label.\n" msgstr "Помилка надсилання Hello до Збирача. ERR=%s\n" -#: src/stored/btape.c:2263 +#: src/stored/btape.c:2262 #, c-format msgid "%s Begin writing Bacula records to tape ...\n" msgstr "" -#: src/stored/btape.c:2265 +#: src/stored/btape.c:2264 #, c-format msgid "%s Begin writing Bacula records to first tape ...\n" msgstr "" -#: src/stored/btape.c:2291 +#: src/stored/btape.c:2290 msgid "Flush block failed.\n" msgstr "" -#: src/stored/btape.c:2305 +#: src/stored/btape.c:2304 #, c-format msgid "Wrote block=%u, file,blk=%u,%u VolBytes=%s rate=%sB/s\n" msgstr "" -#: src/stored/btape.c:2316 +#: src/stored/btape.c:2315 #, c-format msgid "%s Flush block, write EOF\n" msgstr "" -#: src/stored/btape.c:2325 +#: src/stored/btape.c:2324 msgid "Wrote 1000 blocks on second tape. Done.\n" msgstr "" -#: src/stored/btape.c:2330 +#: src/stored/btape.c:2329 msgid "Not OK\n" msgstr "" -#: src/stored/btape.c:2354 +#: src/stored/btape.c:2353 #, fuzzy msgid "Job canceled.\n" msgstr "Статус задачі: Відмінена" -#: src/stored/btape.c:2365 +#: src/stored/btape.c:2364 msgid "Set ok=false after write_block_to_device.\n" msgstr "" -#: src/stored/btape.c:2369 +#: src/stored/btape.c:2368 #, fuzzy msgid "Wrote End of Session label.\n" msgstr "Помилка надсилання Hello до Збирача. ERR=%s\n" -#: src/stored/btape.c:2392 +#: src/stored/btape.c:2391 #, c-format msgid "Wrote state file last_block_num1=%d last_block_num2=%d\n" msgstr "" -#: src/stored/btape.c:2396 +#: src/stored/btape.c:2395 #, fuzzy, c-format msgid "Could not create state file: %s ERR=%s\n" msgstr "Не вдалось створити %s: ERR=%s\n" -#: src/stored/btape.c:2407 +#: src/stored/btape.c:2406 #, c-format msgid "" "\n" @@ -15186,7 +15186,7 @@ msgid "" "%s Done filling tape at %d:%d. Now beginning re-read of tape ...\n" msgstr "" -#: src/stored/btape.c:2410 +#: src/stored/btape.c:2409 #, c-format msgid "" "\n" @@ -15194,24 +15194,24 @@ msgid "" "%s Done filling tapes at %d:%d. Now beginning re-read of first tape ...\n" msgstr "" -#: src/stored/btape.c:2416 +#: src/stored/btape.c:2415 #, fuzzy msgid "do_unfill failed.\n" msgstr "Помилка команди" -#: src/stored/btape.c:2421 +#: src/stored/btape.c:2420 #, c-format msgid "%s: Error during test.\n" msgstr "" -#: src/stored/btape.c:2456 +#: src/stored/btape.c:2455 msgid "" "\n" "The state file level has changed. You must redo\n" "the fill command.\n" msgstr "" -#: src/stored/btape.c:2463 +#: src/stored/btape.c:2462 #, c-format msgid "" "\n" @@ -15219,95 +15219,95 @@ msgid "" "You must redo the fill command.\n" msgstr "" -#: src/stored/btape.c:2529 +#: src/stored/btape.c:2528 msgid "Mount first tape. Press enter when ready: " msgstr "" -#: src/stored/btape.c:2546 +#: src/stored/btape.c:2545 msgid "Rewinding.\n" msgstr "" -#: src/stored/btape.c:2551 +#: src/stored/btape.c:2550 #, c-format msgid "Reading the first 10000 records from %u:%u.\n" msgstr "" -#: src/stored/btape.c:2555 src/stored/btape.c:2627 +#: src/stored/btape.c:2554 src/stored/btape.c:2626 #, c-format msgid "Reposition from %u:%u to %u:%u\n" msgstr "" -#: src/stored/btape.c:2560 src/stored/btape.c:2614 src/stored/btape.c:2632 +#: src/stored/btape.c:2559 src/stored/btape.c:2613 src/stored/btape.c:2631 #, fuzzy, c-format msgid "Reposition error. ERR=%s\n" msgstr "Не вдалось створити %s: ERR=%s\n" -#: src/stored/btape.c:2563 +#: src/stored/btape.c:2562 #, c-format msgid "Reading block %u.\n" msgstr "" -#: src/stored/btape.c:2565 src/stored/btape.c:2619 src/stored/btape.c:2637 +#: src/stored/btape.c:2564 src/stored/btape.c:2618 src/stored/btape.c:2636 #, fuzzy, c-format msgid "Error reading block: ERR=%s\n" msgstr "Помилка у %s: ERR=%s\n" -#: src/stored/btape.c:2570 +#: src/stored/btape.c:2569 msgid "" "\n" "The last block on the tape matches. Test succeeded.\n" "\n" msgstr "" -#: src/stored/btape.c:2573 +#: src/stored/btape.c:2572 msgid "" "\n" "The last block of the first tape matches.\n" "\n" msgstr "" -#: src/stored/btape.c:2597 +#: src/stored/btape.c:2596 msgid "Mount second tape. Press enter when ready: " msgstr "" -#: src/stored/btape.c:2611 +#: src/stored/btape.c:2610 #, c-format msgid "Reposition from %u:%u to 0:1\n" msgstr "" -#: src/stored/btape.c:2617 src/stored/btape.c:2635 +#: src/stored/btape.c:2616 src/stored/btape.c:2634 #, c-format msgid "Reading block %d.\n" msgstr "" -#: src/stored/btape.c:2623 +#: src/stored/btape.c:2622 msgid "" "\n" "The first block on the second tape matches.\n" "\n" msgstr "" -#: src/stored/btape.c:2641 +#: src/stored/btape.c:2640 msgid "" "\n" "The last block on the second tape matches. Test succeeded.\n" "\n" msgstr "" -#: src/stored/btape.c:2659 +#: src/stored/btape.c:2658 #, c-format msgid "10000 records read now at %d:%d\n" msgstr "" -#: src/stored/btape.c:2685 src/stored/btape.c:2696 src/stored/btape.c:2741 +#: src/stored/btape.c:2684 src/stored/btape.c:2695 src/stored/btape.c:2740 msgid "Last block written" msgstr "" -#: src/stored/btape.c:2687 src/stored/btape.c:2697 +#: src/stored/btape.c:2686 src/stored/btape.c:2696 msgid "Block read back" msgstr "" -#: src/stored/btape.c:2688 +#: src/stored/btape.c:2687 #, c-format msgid "" "\n" @@ -15315,7 +15315,7 @@ msgid "" "The blocks differ at byte %u\n" msgstr "" -#: src/stored/btape.c:2689 +#: src/stored/btape.c:2688 msgid "" "\n" "\n" @@ -15325,175 +15325,175 @@ msgid "" "to write multi-tape Volumes.!!!!\n" msgstr "" -#: src/stored/btape.c:2725 +#: src/stored/btape.c:2724 #, c-format msgid "Last block at: %u:%u this_dev_block_num=%d\n" msgstr "" -#: src/stored/btape.c:2739 +#: src/stored/btape.c:2738 #, c-format msgid "Block not written: FileIndex=%u blk_block=%u Size=%u\n" msgstr "" -#: src/stored/btape.c:2743 +#: src/stored/btape.c:2742 msgid "Block not written" msgstr "" -#: src/stored/btape.c:2758 +#: src/stored/btape.c:2757 #, c-format msgid "End of tape %d:%d. Volume Bytes=%s. Write rate = %sB/s\n" msgstr "" -#: src/stored/btape.c:2809 +#: src/stored/btape.c:2808 msgid "Test writing blocks of 64512 bytes to tape.\n" msgstr "" -#: src/stored/btape.c:2811 +#: src/stored/btape.c:2810 msgid "How many blocks do you want to write? (1000): " msgstr "" -#: src/stored/btape.c:2828 +#: src/stored/btape.c:2827 #, c-format msgid "Begin writing %d Bacula blocks to tape ...\n" msgstr "" -#: src/stored/btape.c:2871 +#: src/stored/btape.c:2870 #, c-format msgid "Begin writing raw blocks of %u bytes.\n" msgstr "" -#: src/stored/btape.c:2902 +#: src/stored/btape.c:2901 msgid "test autochanger" msgstr "" -#: src/stored/btape.c:2903 +#: src/stored/btape.c:2902 msgid "backspace file" msgstr "" -#: src/stored/btape.c:2904 +#: src/stored/btape.c:2903 msgid "backspace record" msgstr "" -#: src/stored/btape.c:2905 +#: src/stored/btape.c:2904 msgid "list device capabilities" msgstr "" -#: src/stored/btape.c:2906 +#: src/stored/btape.c:2905 #, fuzzy msgid "clear tape errors" msgstr "Не вдалось створити %s: ERR=%s\n" -#: src/stored/btape.c:2907 +#: src/stored/btape.c:2906 msgid "go to end of Bacula data for append" msgstr "" -#: src/stored/btape.c:2908 +#: src/stored/btape.c:2907 msgid "go to the physical end of medium" msgstr "" -#: src/stored/btape.c:2909 +#: src/stored/btape.c:2908 msgid "fill tape, write onto second volume" msgstr "" -#: src/stored/btape.c:2910 +#: src/stored/btape.c:2909 msgid "read filled tape" msgstr "" -#: src/stored/btape.c:2911 +#: src/stored/btape.c:2910 msgid "forward space a file" msgstr "" -#: src/stored/btape.c:2912 +#: src/stored/btape.c:2911 #, fuzzy msgid "forward space a record" msgstr "Невідомий тип ресурсу %d\n" -#: src/stored/btape.c:2913 +#: src/stored/btape.c:2912 #, fuzzy msgid "print this command" msgstr ": неправильна команда\n" -#: src/stored/btape.c:2914 +#: src/stored/btape.c:2913 msgid "write a Bacula label to the tape" msgstr "" -#: src/stored/btape.c:2915 +#: src/stored/btape.c:2914 msgid "load a tape" msgstr "" -#: src/stored/btape.c:2916 +#: src/stored/btape.c:2915 msgid "quit btape" msgstr "" -#: src/stored/btape.c:2917 +#: src/stored/btape.c:2916 msgid "use write() to fill tape" msgstr "" -#: src/stored/btape.c:2918 +#: src/stored/btape.c:2917 msgid "read and print the Bacula tape label" msgstr "" -#: src/stored/btape.c:2919 +#: src/stored/btape.c:2918 msgid "test record handling functions" msgstr "" -#: src/stored/btape.c:2920 +#: src/stored/btape.c:2919 msgid "rewind the tape" msgstr "" -#: src/stored/btape.c:2921 +#: src/stored/btape.c:2920 msgid "read() tape block by block to EOT and report" msgstr "" -#: src/stored/btape.c:2922 +#: src/stored/btape.c:2921 msgid "Bacula read block by block to EOT and report" msgstr "" -#: src/stored/btape.c:2923 +#: src/stored/btape.c:2922 msgid "" "[file_size=n(GB)|nb_file=3|skip_zero|skip_random|skip_raw|skip_block] report " "drive speed" msgstr "" -#: src/stored/btape.c:2924 +#: src/stored/btape.c:2923 msgid "print tape status" msgstr "" -#: src/stored/btape.c:2925 +#: src/stored/btape.c:2924 msgid "General test Bacula tape functions" msgstr "" -#: src/stored/btape.c:2926 +#: src/stored/btape.c:2925 msgid "write an EOF on the tape" msgstr "" -#: src/stored/btape.c:2927 +#: src/stored/btape.c:2926 msgid "write a single Bacula block" msgstr "" -#: src/stored/btape.c:2928 +#: src/stored/btape.c:2927 msgid "read a single record" msgstr "" -#: src/stored/btape.c:2929 +#: src/stored/btape.c:2928 msgid "read a single Bacula block" msgstr "" -#: src/stored/btape.c:2930 +#: src/stored/btape.c:2929 msgid "quick fill command" msgstr "" -#: src/stored/btape.c:2951 +#: src/stored/btape.c:2950 #, fuzzy, c-format msgid "\"%s\" is an invalid command\n" msgstr ": неправильна команда\n" -#: src/stored/btape.c:2960 +#: src/stored/btape.c:2959 #, c-format msgid "Interactive commands:\n" msgstr "" -#: src/stored/btape.c:2971 +#: src/stored/btape.c:2970 #, fuzzy, c-format msgid "" "\n" @@ -15523,27 +15523,27 @@ msgstr "" " -? показати це повідомлення.\n" "\n" -#: src/stored/btape.c:3042 +#: src/stored/btape.c:3041 #, c-format msgid "Mount second Volume on device %s and press return when ready: " msgstr "" -#: src/stored/btape.c:3070 +#: src/stored/btape.c:3069 #, c-format msgid "Mount blank Volume on device %s and press return when ready: " msgstr "" -#: src/stored/btape.c:3090 +#: src/stored/btape.c:3089 #, fuzzy, c-format msgid "End of Volume \"%s\" %d records.\n" msgstr "У картотеці створено новий Том \"%s\".\n" -#: src/stored/btape.c:3104 +#: src/stored/btape.c:3103 #, c-format msgid "Read block=%u, VolBytes=%s rate=%sB/s\n" msgstr "" -#: src/stored/btape.c:3117 +#: src/stored/btape.c:3116 #, fuzzy, c-format msgid "Cannot open Dev=%s, Vol=%s\n" msgstr "Не вдається відкрити файл %s для введення. ERR=%s\n" diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 5f22d22e..4eb2478a 100755 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -67,6 +67,7 @@ install: installdirs $(MV) -f ${DESTDIR}${scriptdir}/baculabackupreport ${DESTDIR}${scriptdir}/baculabackupreport.old; \ fi $(INSTALL_SCRIPT) baculabackupreport $(DESTDIR)$(scriptdir)/baculabackupreport + $(INSTALL_SCRIPT) bacula-tray-monitor.desktop $(DESTDIR)$(scriptdir)/bacula-tray-monitor.desktop chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \ $(DESTDIR)$(scriptdir)/btraceback.dbx \ $(DESTDIR)$(scriptdir)/btraceback.mdb diff --git a/src/cats/mysql.c b/src/cats/mysql.c index 3aa9a668..5abfa439 100644 --- a/src/cats/mysql.c +++ b/src/cats/mysql.c @@ -198,6 +198,7 @@ bool BDB_MYSQL::bdb_open_database(JCR *jcr) BDB_MYSQL *mdb = this; bool retval = false; int errstat; + my_bool reconnect = 1; P(mutex); if (mdb->m_connected) { @@ -258,7 +259,7 @@ bool BDB_MYSQL::bdb_open_database(JCR *jcr) bmicrosleep(5,0); } - mdb->m_instance.reconnect = 1; /* so connection does not timeout */ + mysql_options(&mdb->m_instance, MYSQL_OPT_RECONNECT, &reconnect); /* so connection does not timeout */ Dmsg0(50, "mysql_real_connect done\n"); Dmsg3(50, "db_user=%s db_name=%s db_password=%s\n", mdb->m_db_user, mdb->m_db_name, (mdb->m_db_password == NULL) ? "(NULL)" : mdb->m_db_password); diff --git a/src/cats/postgresql.c b/src/cats/postgresql.c index 3f7ec611..3b3d98ce 100644 --- a/src/cats/postgresql.c +++ b/src/cats/postgresql.c @@ -36,9 +36,18 @@ #ifdef HAVE_POSTGRESQL #include "cats.h" + +/* Note in this file, we want these for Postgresql not Bacula */ +#undef PACKAGE_BUGREPORT +#undef PACKAGE_NAME +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME +#undef PACKAGE_VERSION + #include "libpq-fe.h" #include "postgres_ext.h" /* needed for NAMEDATALEN */ #include "pg_config_manual.h" /* get NAMEDATALEN on version 8.3 or later */ +#include "pg_config.h" /* for PG_VERSION_NUM */ #define __BDB_POSTGRESQL_H_ 1 #include "bdb_postgresql.h" @@ -262,6 +271,20 @@ bool BDB_POSTGRESQL::bdb_open_database(JCR *jcr) /* If connection fails, try at 5 sec intervals for 30 seconds. */ for (int retry=0; retry < 6; retry++) { /* connect to the database */ + +#if PG_VERSION_NUM < 90000 + + /* Old "depreciated" connection call */ + mdb->m_db_handle = PQsetdbLogin( + mdb->m_db_address, /* default = localhost */ + port, /* default port */ + NULL, /* pg options */ + NULL, /* tty, ignored */ + mdb->m_db_name, /* database name */ + mdb->m_db_user, /* login name */ + mdb->m_db_password); /* password */ +#else + /* Code for Postgresql 9.0 and greater */ const char *keywords[10] = {"host", "port", "dbname", "user", "password", "sslmode", @@ -277,8 +300,8 @@ bool BDB_POSTGRESQL::bdb_open_database(JCR *jcr) mdb->m_db_ssl_cert, mdb->m_db_ssl_ca, NULL }; - mdb->m_db_handle = PQconnectdbParams(keywords, - values, 0); + mdb->m_db_handle = PQconnectdbParams(keywords, values, 0); +#endif /* If no connect, try once more in case it is a timing problem */ if (PQstatus(mdb->m_db_handle) == CONNECTION_OK) { diff --git a/src/dird/bdirjson.c b/src/dird/bdirjson.c index f44f77ea..948d1e8e 100644 --- a/src/dird/bdirjson.c +++ b/src/dird/bdirjson.c @@ -760,6 +760,7 @@ static void display_run(HPKT &hpkt) sendit(NULL, " \"%s\": \"%s\"", RunFields[i].name, joblevels[j].level_name); first = false; + break; } } //} diff --git a/src/dird/ua_label.c b/src/dird/ua_label.c index 45c6c969..f2e1c510 100644 --- a/src/dird/ua_label.c +++ b/src/dird/ua_label.c @@ -611,9 +611,11 @@ static void label_from_barcodes(UAContext *ua, int drive) } continue; /* done, go handle next volume */ } - bstrncpy(mr.MediaType, store->media_type, sizeof(mr.MediaType)); + /* Not a cleaning tape */ + bstrncpy(mr.MediaType, store->media_type, sizeof(mr.MediaType)); mr.Slot = vl->Slot; + send_label_request(ua, &mr, &omr, &pr, 0, media_record_exists, drive); } @@ -984,6 +986,9 @@ int get_num_drives_from_SD(UAContext *ua) */ static bool is_cleaning_tape(UAContext *ua, MEDIA_DBR *mr, POOL_DBR *pr) { + if (ua->jcr->pool->cleaning_prefix == NULL) { + return false; /* if no cleaning prefix, this is not a cleaning tape */ + } /* Find Pool resource */ ua->jcr->pool = (POOL *)GetResWithName(R_POOL, pr->Name); if (!ua->jcr->pool) { @@ -991,9 +996,6 @@ static bool is_cleaning_tape(UAContext *ua, MEDIA_DBR *mr, POOL_DBR *pr) pr->Name, mr->VolumeName); return false; } - if (ua->jcr->pool->cleaning_prefix == NULL) { - return false; - } Dmsg4(100, "CLNprefix=%s: Vol=%s: len=%d strncmp=%d\n", ua->jcr->pool->cleaning_prefix, mr->VolumeName, strlen(ua->jcr->pool->cleaning_prefix), @@ -1003,7 +1005,10 @@ static bool is_cleaning_tape(UAContext *ua, MEDIA_DBR *mr, POOL_DBR *pr) strlen(ua->jcr->pool->cleaning_prefix)) == 0; } -static void content_send_info(UAContext *ua, char type, int Slot, char *vol_name) +/* + * Send Volume info to caller in API format + */ +static void send_volume_info(UAContext *ua, char type, int Slot, char *vol_name) { char ed1[50], ed2[50], ed3[50]; POOL_DBR pr; @@ -1127,7 +1132,7 @@ void status_content(UAContext *ua, STORE *store) ua->send_msg("D|%d||\n", Drive); } else if (sscanf(sd->msg, "%c:%d:F:%127s", &type, &Slot, vol_name)== 3) { - content_send_info(ua, type, Slot, vol_name); + send_volume_info(ua, type, Slot, vol_name); } else if (sscanf(sd->msg, "%c:%d:E", &type, &Slot) == 2) { /* type can be S (slot) or I (Import/Export slot) */ @@ -1148,7 +1153,7 @@ void status_content(UAContext *ua, STORE *store) } prev = vl; } - content_send_info(ua, type, Slot, vol_name); + send_volume_info(ua, type, Slot, vol_name); } else { Dmsg1(10, "Discarding msg=%s\n", sd->msg); @@ -1170,7 +1175,7 @@ void status_slots(UAContext *ua, STORE *store_r) int max_slots; int i=1; /* Slot | Volume | Status | MediaType | Pool */ - const char *slot_hformat=" %4i%c| %16s | %9s | %20s | %18s |\n"; + const char *slot_hformat="| %4i%c| %-20s | %-9s | %-15s | %-18s |\n"; if (ua->api) { status_content(ua, store_r); @@ -1204,8 +1209,9 @@ void status_slots(UAContext *ua, STORE *store_r) ua->warning_msg(_("No Volumes found, or no barcodes.\n")); goto bail_out; } - ua->send_msg(_(" Slot | Volume Name | Status | Media Type | Pool |\n")); - ua->send_msg(_("------+------------------+-----------+----------------------+--------------------|\n")); + ua->send_msg(_("+------+----------------------+-----------+-----------------+--------------------+\n")); + ua->send_msg(_("| Slot | Volume Name | Status | Media Type | Pool |\n")); + ua->send_msg(_("+------+----------------------+-----------+-----------------+--------------------+\n")); /* Walk through the list getting the media records */ for (vl=vol_list; vl; vl=vl->next) { @@ -1238,6 +1244,7 @@ void status_slots(UAContext *ua, STORE *store_r) slot_list[i]=0; } } + ua->send_msg(_("+------+----------------------+-----------+-----------------+--------------------+\n")); memset(&mr, 0, sizeof(MEDIA_DBR)); bstrncpy(mr.VolumeName, vl->VolName, sizeof(mr.VolumeName)); diff --git a/src/filed/backup.c b/src/filed/backup.c index 02c907b9..f76ff867 100644 --- a/src/filed/backup.c +++ b/src/filed/backup.c @@ -1030,10 +1030,10 @@ static bool setup_compression(bctx_t &bctx) if ((bctx.ff_pkt->flags & FO_COMPRESS) && bctx.ff_pkt->Compress_algo == COMPRESS_GZIP) { if ((bctx.ff_pkt->flags & FO_SPARSE) || (bctx.ff_pkt->flags & FO_OFFSETS)) { - bctx.cbuf = (Bytef *)jcr->compress_buf + OFFSET_FADDR_SIZE; + bctx.cbuf = (unsigned char *)jcr->compress_buf + OFFSET_FADDR_SIZE; bctx.max_compress_len = jcr->compress_buf_size - OFFSET_FADDR_SIZE; } else { - bctx.cbuf = (Bytef *)jcr->compress_buf; + bctx.cbuf = (unsigned char *)jcr->compress_buf; bctx.max_compress_len = jcr->compress_buf_size; /* set max length */ } bctx.wbuf = jcr->compress_buf; /* compressed output here */ @@ -1062,12 +1062,12 @@ static bool setup_compression(bctx_t &bctx) if ((bctx.ff_pkt->flags & FO_COMPRESS) && bctx.ff_pkt->Compress_algo == COMPRESS_LZO1X) { if ((bctx.ff_pkt->flags & FO_SPARSE) || (bctx.ff_pkt->flags & FO_OFFSETS)) { - bctx.cbuf = (Bytef *)jcr->compress_buf + OFFSET_FADDR_SIZE; - bctx.cbuf2 = (Bytef *)jcr->compress_buf + OFFSET_FADDR_SIZE + sizeof(comp_stream_header); + bctx.cbuf = (unsigned char *)jcr->compress_buf + OFFSET_FADDR_SIZE; + bctx.cbuf2 = (unsigned char *)jcr->compress_buf + OFFSET_FADDR_SIZE + sizeof(comp_stream_header); bctx.max_compress_len = jcr->compress_buf_size - OFFSET_FADDR_SIZE; } else { - bctx.cbuf = (Bytef *)jcr->compress_buf; - bctx.cbuf2 = (Bytef *)jcr->compress_buf + sizeof(comp_stream_header); + bctx.cbuf = (unsigned char *)jcr->compress_buf; + bctx.cbuf2 = (unsigned char *)jcr->compress_buf + sizeof(comp_stream_header); bctx.max_compress_len = jcr->compress_buf_size; /* set max length */ } bctx.ch.magic = COMPRESS_LZO1X; @@ -1076,8 +1076,6 @@ static bool setup_compression(bctx_t &bctx) bctx.cipher_input = (uint8_t *)jcr->compress_buf; /* encrypt compressed data */ } #endif -#else - bctx.max_compress_len = 0; #endif return true; } @@ -1154,7 +1152,7 @@ static bool do_libz_compression(bctx_t &bctx) if (bctx.ff_pkt->flags & FO_COMPRESS && bctx.ff_pkt->Compress_algo == COMPRESS_GZIP && jcr->pZLIB_compress_workset) { Dmsg3(400, "cbuf=0x%x rbuf=0x%x len=%u\n", bctx.cbuf, bctx.rbuf, sd->msglen); - ((z_stream*)jcr->pZLIB_compress_workset)->next_in = (Bytef *)bctx.rbuf; + ((z_stream*)jcr->pZLIB_compress_workset)->next_in = (unsigned char *)bctx.rbuf; ((z_stream*)jcr->pZLIB_compress_workset)->avail_in = sd->msglen; ((z_stream*)jcr->pZLIB_compress_workset)->next_out = bctx.cbuf; ((z_stream*)jcr->pZLIB_compress_workset)->avail_out = bctx.max_compress_len; diff --git a/src/filed/backup.h b/src/filed/backup.h index 1fe96b65..17188491 100644 --- a/src/filed/backup.h +++ b/src/filed/backup.h @@ -48,12 +48,19 @@ struct bctx_t { uint32_t encrypted_len; /* Compression variables */ -#if defined(HAVE_LIBZ) || defined(HAVE_LZO) - uLong compress_len; - uLong max_compress_len; - Bytef *cbuf; - Bytef *cbuf2; -#endif + /* These are the same as used by libz, but I find it very + * uncomfortable to define variables like this rather than + * specifying a number of bits. Defining them here allows us + * to have code that compiles with and without libz and lzo. + * + * uLong == unsigned long int + * Bytef == unsigned char + */ + unsigned long int max_compress_len; + unsigned long int compress_len; + unsigned char *cbuf; + unsigned char *cbuf2; + #ifdef HAVE_LZO comp_stream_header ch; #endif diff --git a/src/stored/btape.c b/src/stored/btape.c index f6e50c1a..e88a9b79 100644 --- a/src/stored/btape.c +++ b/src/stored/btape.c @@ -1966,7 +1966,7 @@ static void scancmd() blocks = block_size = tot_blocks = 0; bytes = 0; - if (dev->state & ST_EOT) { + if (dev->at_eot()) { Pmsg0(0, _("End of tape\n")); return; } @@ -2009,18 +2009,17 @@ static void scancmd() dev->update_pos(dcr); printf(_("End of File mark.\n")); /* Two reads of zero means end of tape */ - if (dev->state & ST_EOF) - dev->state |= ST_EOT; - else { - dev->state |= ST_EOF; - dev->file++; + if (dev->at_eof()) { + dev->set_ateot(); + } else { + dev->set_ateof(); } - if (dev->state & ST_EOT) { + if (dev->at_eot()) { printf(_("End of tape\n")); break; } } else { /* Got data */ - dev->state &= ~ST_EOF; + dev->clear_eof(); blocks++; tot_blocks++; bytes += stat; @@ -2057,7 +2056,7 @@ static void scan_blocks() for (;;) { if (!dcr->read_block_from_device(NO_BLOCK_NUMBER_CHECK)) { Dmsg1(100, "!read_block(): ERR=%s\n", dev->bstrerror()); - if (dev->state & ST_EOT) { + if (dev->at_eot()) { if (blocks > 0) { if (blocks==1) { printf(_("1 block of %d bytes in file %d\n"), block_size, dev->file); diff --git a/src/stored/tape_dev.c b/src/stored/tape_dev.c index 908149a8..cb5e9b74 100644 --- a/src/stored/tape_dev.c +++ b/src/stored/tape_dev.c @@ -1059,6 +1059,9 @@ bool tape_dev::mount_tape(int mount, int dotimeout) void tape_dev::set_ateof() { + if (at_eof()) { + return; + } DEVICE::set_ateof(); file++; } diff --git a/src/version.h b/src/version.h index 8f0af46e..b5327889 100644 --- a/src/version.h +++ b/src/version.h @@ -5,9 +5,9 @@ #define COMMUNITY 1 /* Define to create a Windows community binary */ /* Note: there can be only *one* VERSION in this file */ -#define VERSION "9.0.1" -#define BDATE "12 July 2017" -#define LSMDATE "12Jul17" +#define VERSION "9.0.2" +#define BDATE "24 July 2017" +#define LSMDATE "24Jul17" #define RELEASE 1 /* Use ONLY in rpms */ |