X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fpo%2Fit.po;h=cdc8e8bae0e6ba01e63a058dba6b52b4d5c07ade;hb=01448b9cc8baff2e1942aaa59b71c36ee1cf070c;hp=0d907e35f54e9670583eac636577a985fe869f46;hpb=f9ac38eacc708ebc232663c3b67741229be74398;p=bacula%2Fbacula

diff --git a/bacula/po/it.po b/bacula/po/it.po
index 0d907e35f5..cdc8e8bae0 100644
--- a/bacula/po/it.po
+++ b/bacula/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Bacula 1.38\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-12-20 12:48+0100\n"
+"POT-Creation-Date: 2007-08-10 23:23+0200\n"
 "PO-Revision-Date: 2005-08-08 17:50+0200\n"
 "Last-Translator:  <fparacchini@alteanet.it>\n"
 "Language-Team: Italian <bacula-devel@lists.sourceforge.net>\n"
@@ -16,35 +16,35 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/cats/bdb.c:147
+#: src/cats/bdb.c:161
 msgid "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
 msgstr ""
 
-#: src/cats/bdb.c:148
+#: src/cats/bdb.c:162
 msgid "WARNING!!!! The Internal Database is NOT OPERATIONAL!\n"
 msgstr ""
 
-#: src/cats/bdb.c:149
+#: src/cats/bdb.c:163
 msgid "You should use SQLite, PostgreSQL, or MySQL\n"
 msgstr ""
 
-#: src/cats/bdb.c:171 src/cats/mysql.c:148 src/cats/postgresql.c:153
-#: src/cats/sqlite.c:139
+#: src/cats/bdb.c:185 src/cats/mysql.c:152 src/cats/postgresql.c:161
+#: src/cats/sqlite.c:160
 #, c-format
 msgid "Unable to initialize DB lock. ERR=%s\n"
 msgstr ""
 
-#: src/cats/bdb.c:181
+#: src/cats/bdb.c:195
 #, c-format
 msgid "Unable to open Catalog DB control file %s: ERR=%s\n"
 msgstr ""
 
-#: src/cats/bdb.c:236
+#: src/cats/bdb.c:250
 #, c-format
 msgid "Error reading catalog DB control file. ERR=%s\n"
 msgstr ""
 
-#: src/cats/bdb.c:239
+#: src/cats/bdb.c:253
 #, c-format
 msgid ""
 "Error, catalog DB control file wrong version. Wanted %d, got %d\n"
@@ -65,15 +65,16 @@ msgstr ""
 msgid "A user name for MySQL must be supplied.\n"
 msgstr ""
 
-#: src/cats/mysql.c:185
+#: src/cats/mysql.c:190
 #, c-format
 msgid ""
-"Unable to connect to MySQL server. \n"
+"Unable to connect to MySQL server.\n"
 "Database=%s User=%s\n"
-"It is probably not running or your password is incorrect.\n"
+"MySQL connect failed either server not running or your authorization is "
+"incorrect.\n"
 msgstr ""
 
-#: src/cats/mysql.c:345 src/cats/postgresql.c:291 src/cats/sqlite.c:340
+#: src/cats/mysql.c:367 src/cats/postgresql.c:304 src/cats/sqlite.c:351
 #, c-format
 msgid "Query failed: %s: ERR=%s\n"
 msgstr ""
@@ -82,7 +83,13 @@ msgstr ""
 msgid "A user name for PostgreSQL must be supplied.\n"
 msgstr ""
 
-#: src/cats/postgresql.c:190
+#: src/cats/postgresql.c:148
+msgid ""
+"PostgreSQL configuration problem. PostgreSQL library is not thread safe. "
+"Connot continue.\n"
+msgstr ""
+
+#: src/cats/postgresql.c:198
 #, c-format
 msgid ""
 "Unable to connect to PostgreSQL server.\n"
@@ -90,206 +97,217 @@ msgid ""
 "It is probably not running or your password is incorrect.\n"
 msgstr ""
 
-#: src/cats/postgresql.c:533
+#: src/cats/postgresql.c:590
 #, c-format
 msgid "error fetching currval: %s\n"
 msgstr ""
 
-#: src/cats/sql.c:122
+#: src/cats/postgresql.c:682 src/cats/postgresql.c:729
+#, c-format
+msgid "error ending batch mode: %s\n"
+msgstr ""
+
+#: src/cats/sql.c:139
 #, c-format
 msgid ""
 "query %s failed:\n"
 "%s\n"
 msgstr ""
 
-#: src/cats/sql.c:144
+#: src/cats/sql.c:161
 #, c-format
 msgid ""
 "insert %s failed:\n"
 "%s\n"
 msgstr ""
 
-#: src/cats/sql.c:158
+#: src/cats/sql.c:175
 #, c-format
 msgid "Insertion problem: affected_rows=%s\n"
 msgstr ""
 
-#: src/cats/sql.c:178
+#: src/cats/sql.c:195
 #, c-format
 msgid ""
 "update %s failed:\n"
 "%s\n"
 msgstr ""
 
-#: src/cats/sql.c:188
+#: src/cats/sql.c:205
 #, c-format
-msgid "Update problem: affected_rows=%s\n"
+msgid "Update failed: affected_rows=%s for %s\n"
 msgstr ""
 
-#: src/cats/sql.c:209
+#: src/cats/sql.c:226
 #, c-format
 msgid ""
 "delete %s failed:\n"
 "%s\n"
 msgstr ""
 
-#: src/cats/sql.c:235 src/cats/sql.c:242 src/cats/sql_create.c:792
-#: src/cats/sql_get.c:186 src/cats/sql_get.c:237 src/cats/sql_get.c:592
-#: src/cats/sql_get.c:667 src/cats/sql_get.c:898
+#: src/cats/sql.c:252 src/cats/sql.c:259 src/cats/sql_create.c:1018
+#: src/cats/sql_get.c:185 src/cats/sql_get.c:236 src/cats/sql_get.c:604
+#: src/cats/sql_get.c:680 src/cats/sql_get.c:951
 #, c-format
 msgid "error fetching row: %s\n"
 msgstr ""
 
-#: src/cats/sql.c:352 src/dird/catreq.c:399 src/dird/catreq.c:473
+#: src/cats/sql.c:369 src/dird/catreq.c:404 src/dird/catreq.c:478
+#: src/dird/fd_cmds.c:638 src/dird/fd_cmds.c:696
 #, c-format
 msgid "Attribute create error. %s"
 msgstr ""
 
-#: src/cats/sql.c:433
+#: src/cats/sql.c:450
 #, c-format
 msgid "Path length is zero. File=%s\n"
 msgstr ""
 
-#: src/cats/sql.c:477
+#: src/cats/sql.c:494
 msgid "No results to list.\n"
 msgstr ""
 
-#: src/cats/sql_create.c:92
+#: src/cats/sql_create.c:95
 #, c-format
 msgid "Create DB Job record %s failed. ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:143
+#: src/cats/sql_create.c:146
 #, c-format
 msgid "Create JobMedia record %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:152
+#: src/cats/sql_create.c:155
 #, c-format
 msgid "Update Media record %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:182
+#: src/cats/sql_create.c:185
 #, c-format
 msgid "pool record %s already exists\n"
 msgstr ""
 
-#: src/cats/sql_create.c:208
+#: src/cats/sql_create.c:212
 #, c-format
 msgid "Create db Pool record %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:239
+#: src/cats/sql_create.c:243
 #, c-format
 msgid "Device record %s already exists\n"
 msgstr ""
 
-#: src/cats/sql_create.c:255
+#: src/cats/sql_create.c:259
 #, c-format
 msgid "Create db Device record %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:288
+#: src/cats/sql_create.c:292
 #, c-format
 msgid "More than one Storage record!: %d\n"
 msgstr ""
 
-#: src/cats/sql_create.c:293
+#: src/cats/sql_create.c:297
 #, c-format
 msgid "error fetching Storage row: %s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:313
+#: src/cats/sql_create.c:317
 #, c-format
 msgid "Create DB Storage record %s failed. ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:345
+#: src/cats/sql_create.c:349
 #, c-format
 msgid "mediatype record %s already exists\n"
 msgstr ""
 
-#: src/cats/sql_create.c:361
+#: src/cats/sql_create.c:365
 #, c-format
 msgid "Create db mediatype record %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:396
+#: src/cats/sql_create.c:400
 #, c-format
 msgid "Volume \"%s\" already exists.\n"
 msgstr ""
 
-#: src/cats/sql_create.c:441
+#: src/cats/sql_create.c:445
 #, c-format
 msgid "Create DB Media record %s failed. ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:489
+#: src/cats/sql_create.c:493
 #, c-format
 msgid "More than one Client!: %d\n"
 msgstr ""
 
-#: src/cats/sql_create.c:494
+#: src/cats/sql_create.c:498
 #, c-format
 msgid "error fetching Client row: %s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:521
+#: src/cats/sql_create.c:525
 #, c-format
 msgid "Create DB Client record %s failed. ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:564
+#: src/cats/sql_create.c:568
 #, c-format
 msgid "Create DB Counters record %s failed. ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:597
+#: src/cats/sql_create.c:601
 #, c-format
 msgid "More than one FileSet!: %d\n"
 msgstr ""
 
-#: src/cats/sql_create.c:602
+#: src/cats/sql_create.c:606
 #, c-format
 msgid "error fetching FileSet row: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:632
+#: src/cats/sql_create.c:636
 #, c-format
 msgid "Create DB FileSet record %s failed. ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:689
+#: src/cats/sql_create.c:850 src/dird/job.c:131 src/dird/ua_output.c:628
+#, c-format
+msgid "Could not open database \"%s\".\n"
+msgstr ""
+
+#: src/cats/sql_create.c:873 src/cats/sql_create.c:914
 #, c-format
 msgid "Attempt to put non-attributes into catalog. Stream=%d\n"
 msgstr ""
 
-#: src/cats/sql_create.c:752
+#: src/cats/sql_create.c:978
 #, c-format
 msgid "Create db File record %s failed. ERR=%s"
 msgstr ""
 
-#: src/cats/sql_create.c:785 src/cats/sql_get.c:230
+#: src/cats/sql_create.c:1011 src/cats/sql_get.c:229
 #, c-format
 msgid "More than one Path!: %s for path: %s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:816
+#: src/cats/sql_create.c:1042
 #, c-format
 msgid "Create db Path record %s failed. ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:849
+#: src/cats/sql_create.c:1075
 #, c-format
 msgid "More than one Filename! %s for file: %s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:855
+#: src/cats/sql_create.c:1081
 #, c-format
 msgid "Error fetching row for file=%s: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_create.c:871
+#: src/cats/sql_create.c:1097
 #, c-format
 msgid "Create db Filename record %s failed. ERR=%s\n"
 msgstr ""
@@ -347,219 +365,209 @@ msgstr ""
 msgid "No Job found for: %s\n"
 msgstr ""
 
-#: src/cats/sql_find.c:327
+#: src/cats/sql_find.c:332
 #, c-format
 msgid "Request for Volume item %d greater than max %d or less than 1\n"
 msgstr ""
 
-#: src/cats/sql_find.c:341
+#: src/cats/sql_find.c:347
 #, c-format
 msgid "No Volume record found for item %d.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:136
+#: src/cats/sql_get.c:135
 #, c-format
 msgid "get_file_record want 1 got rows=%d\n"
 msgstr ""
 
-#: src/cats/sql_get.c:141
+#: src/cats/sql_get.c:140
 #, c-format
 msgid "Error fetching row: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:149
+#: src/cats/sql_get.c:148
 #, c-format
 msgid "File record for PathId=%s FilenameId=%s not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:155
+#: src/cats/sql_get.c:154
 msgid "File record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:180
+#: src/cats/sql_get.c:179
 #, c-format
 msgid "More than one Filename!: %s for file: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:190
+#: src/cats/sql_get.c:189
 #, c-format
 msgid "Get DB Filename record %s found bad record: %d\n"
 msgstr ""
 
-#: src/cats/sql_get.c:196
+#: src/cats/sql_get.c:195
 #, c-format
 msgid "Filename record: %s not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:200
+#: src/cats/sql_get.c:199
 #, c-format
 msgid "Filename record: %s not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:241
+#: src/cats/sql_get.c:240
 #, c-format
 msgid "Get DB path record %s found bad record: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:254
+#: src/cats/sql_get.c:253
 #, c-format
 msgid "Path record: %s not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:258
+#: src/cats/sql_get.c:257
 #, c-format
 msgid "Path record: %s not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:293
+#: src/cats/sql_get.c:294
 #, c-format
 msgid "No Job found for JobId %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:352 src/cats/sql_get.c:408
+#: src/cats/sql_get.c:363 src/cats/sql_get.c:419
 #, c-format
 msgid "No volumes found for JobId=%d\n"
 msgstr ""
 
-#: src/cats/sql_get.c:358 src/cats/sql_get.c:421
+#: src/cats/sql_get.c:369 src/cats/sql_get.c:430
 #, c-format
 msgid "Error fetching row %d: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:372
+#: src/cats/sql_get.c:383
 #, c-format
 msgid "No Volume for JobId %d found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:508
+#: src/cats/sql_get.c:520
 #, c-format
 msgid "Pool id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:545
+#: src/cats/sql_get.c:557
 #, c-format
 msgid "Client id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:587
+#: src/cats/sql_get.c:599
 #, c-format
 msgid "More than one Pool!: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:628
+#: src/cats/sql_get.c:641
 msgid "Pool record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:662
+#: src/cats/sql_get.c:675
 #, c-format
 msgid "More than one Client!: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:679 src/cats/sql_get.c:683
+#: src/cats/sql_get.c:692 src/cats/sql_get.c:696
 msgid "Client record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:708
+#: src/cats/sql_get.c:721
 #, c-format
 msgid "More than one Counter!: %d\n"
 msgstr ""
 
-#: src/cats/sql_get.c:713
+#: src/cats/sql_get.c:726
 #, c-format
 msgid "error fetching Counter row: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:733
+#: src/cats/sql_get.c:746
 #, c-format
 msgid "Counter record: %s not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:769
+#: src/cats/sql_get.c:782
 #, c-format
 msgid "Error got %s FileSets but expected only one!\n"
 msgstr ""
 
-#: src/cats/sql_get.c:774
+#: src/cats/sql_get.c:787
 #, c-format
 msgid "FileSet record \"%s\" not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:784
+#: src/cats/sql_get.c:797
 msgid "FileSet record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:841
+#: src/cats/sql_get.c:855
 #, c-format
 msgid "Media id select failed: ERR=%s\n"
 msgstr ""
 
 #: src/cats/sql_get.c:893
 #, c-format
-msgid "More than one Volume!: %s\n"
+msgid "query dbids failed: ERR=%s\n"
 msgstr ""
 
 #: src/cats/sql_get.c:946
 #, c-format
+msgid "More than one Volume!: %s\n"
+msgstr ""
+
+#: src/cats/sql_get.c:1001
+#, c-format
 msgid "Media record MediaId=%s not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:949
+#: src/cats/sql_get.c:1004
 #, c-format
 msgid "Media record for Volume \"%s\" not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:956
+#: src/cats/sql_get.c:1011
 #, c-format
 msgid "Media record for MediaId=%u not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:959
+#: src/cats/sql_get.c:1014
 #, c-format
 msgid "Media record for Vol=%s not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_list.c:61
+#: src/cats/sql_list.c:62
 #, c-format
 msgid "Query failed: %s\n"
 msgstr ""
 
-#: src/cats/sqlite.c:153
+#: src/cats/sqlite.c:174
 #, c-format
 msgid "Database %s does not exist, please create it.\n"
 msgstr ""
 
-#: src/cats/sqlite.c:178
+#: src/cats/sqlite.c:204
 #, c-format
 msgid "Unable to open Database=%s. ERR=%s\n"
 msgstr ""
 
-#: src/cats/sqlite.c:179 src/lib/bnet_server.c:386
+#: src/cats/sqlite.c:205 src/lib/bnet_server.c:391
 msgid "unknown"
 msgstr ""
 
-#: src/cats/sqlite.c:238
-#, c-format
-msgid "next_index query error: ERR=%s\n"
-msgstr ""
-
-#: src/cats/sqlite.c:243
-#, c-format
-msgid "Error fetching index: ERR=%s\n"
-msgstr ""
-
-#: src/cats/sqlite.c:253
-#, c-format
-msgid "next_index update error: ERR=%s\n"
-msgstr ""
-
 #: src/dird/admin.c:63
 #, c-format
 msgid "Start Admin JobId %d, Job=%s\n"
 msgstr ""
 
-#: src/dird/admin.c:89 src/dird/backup.c:350 src/dird/migrate.c:1060
+#: src/dird/admin.c:89 src/dird/backup.c:355 src/dird/migrate.c:1077
 #, c-format
-msgid "Error getting job record for stats: %s"
+msgid "Error getting Job record for Job report: ERR=%s"
 msgstr ""
 
 #: src/dird/admin.c:97
@@ -574,7 +582,7 @@ msgstr ""
 msgid "Admin Canceled"
 msgstr ""
 
-#: src/dird/admin.c:109 src/dird/backup.c:400 src/dird/restore.c:266
+#: src/dird/admin.c:109 src/dird/backup.c:405 src/dird/restore.c:279
 #, c-format
 msgid "Inappropriate term code: %c\n"
 msgstr ""
@@ -583,6 +591,23 @@ msgstr ""
 msgid "Bacula "
 msgstr ""
 
+#: src/dird/admin.c:115 src/console/console.c:114
+#, c-format
+msgid " ("
+msgstr ""
+
+#: src/dird/admin.c:115
+#, c-format
+msgid ""
+"): %s\n"
+"  JobId:                  %d\n"
+"  Job:                    %s\n"
+"  Start time:             %s\n"
+"  End time:               %s\n"
+"  Termination:            %s\n"
+"\n"
+msgstr ""
+
 #: src/dird/authenticate.c:80 src/dird/authenticate.c:81
 #: src/tray-monitor/authenticate.c:132
 #, c-format
@@ -596,7 +621,7 @@ msgstr ""
 #: src/dird/authenticate.c:108
 #, c-format
 msgid ""
-"Director unable to authenticate with Storage daemon on \"%s:%d\". Possible "
+"Director unable to authenticate with Storage daemon at \"%s:%d\". Possible "
 "causes:\n"
 "Passwords or names not the same or\n"
 "Maximum Concurrent Jobs exceeded on the SD or\n"
@@ -622,7 +647,7 @@ msgstr ""
 
 #: src/dird/authenticate.c:136
 #, c-format
-msgid "TLS negotiation failed with SD on \"%s:%d\"\n"
+msgid "TLS negotiation failed with SD at \"%s:%d\"\n"
 msgstr ""
 
 #: src/dird/authenticate.c:145
@@ -636,12 +661,12 @@ msgstr ""
 
 #: src/dird/authenticate.c:153
 #, c-format
-msgid "Storage daemon on \"%s:%d\" rejected Hello command\n"
+msgid "Storage daemon at \"%s:%d\" rejected Hello command\n"
 msgstr ""
 
 #: src/dird/authenticate.c:182
 #, c-format
-msgid "Error sending Hello to File daemon on \"%s:%d\". ERR=%s\n"
+msgid "Error sending Hello to File daemon at \"%s:%d\". ERR=%s\n"
 msgstr ""
 
 #: src/dird/authenticate.c:208
@@ -651,7 +676,7 @@ msgstr ""
 #: src/dird/authenticate.c:210
 #, c-format
 msgid ""
-"Unable to authenticate with File daemon on \"%s:%d\". Possible causes:\n"
+"Unable to authenticate with File daemon at \"%s:%d\". Possible causes:\n"
 "Passwords or names not the same or\n"
 "Maximum Concurrent Jobs exceeded on the FD or\n"
 "FD networking messed up (restart daemon).\n"
@@ -667,85 +692,85 @@ msgstr ""
 
 #: src/dird/authenticate.c:230
 #, c-format
-msgid "Authorization problem: FD on \"%s:%d\" requires TLS.\n"
+msgid "Authorization problem: FD at \"%s:%d\" requires TLS.\n"
 msgstr ""
 
-#: src/dird/authenticate.c:240
+#: src/dird/authenticate.c:241
 #, c-format
-msgid "TLS negotiation failed with FD on \"%s:%d\".\n"
+msgid "TLS negotiation failed with FD at \"%s:%d\".\n"
 msgstr ""
 
-#: src/dird/authenticate.c:249 src/tray-monitor/authenticate.c:191
+#: src/dird/authenticate.c:250 src/tray-monitor/authenticate.c:191
 #, c-format
 msgid "Bad response from File daemon to Hello command: ERR=%s\n"
 msgstr ""
 
-#: src/dird/authenticate.c:251
+#: src/dird/authenticate.c:252
 #, c-format
-msgid "Bad response from File daemon on \"%s:%d\" to Hello command: ERR=%s\n"
+msgid "Bad response from File daemon at \"%s:%d\" to Hello command: ERR=%s\n"
 msgstr ""
 
-#: src/dird/authenticate.c:258 src/tray-monitor/authenticate.c:198
+#: src/dird/authenticate.c:259 src/tray-monitor/authenticate.c:198
 msgid "File daemon rejected Hello command\n"
 msgstr ""
 
-#: src/dird/authenticate.c:259
+#: src/dird/authenticate.c:260
 #, c-format
-msgid "File daemon on \"%s:%d\" rejected Hello command\n"
+msgid "File daemon at \"%s:%d\" rejected Hello command\n"
 msgstr ""
 
-#: src/dird/authenticate.c:285
+#: src/dird/authenticate.c:283
 #, c-format
 msgid "UA Hello from %s:%s:%d is invalid. Len=%d\n"
 msgstr ""
 
-#: src/dird/authenticate.c:292
+#: src/dird/authenticate.c:290
 #, c-format
 msgid "UA Hello from %s:%s:%d is invalid. Got: %s\n"
 msgstr ""
 
-#: src/dird/authenticate.c:347
+#: src/dird/authenticate.c:345
 msgid ""
 "Authorization problem: Remote client did not advertise required TLS "
 "support.\n"
 msgstr ""
 
-#: src/dird/authenticate.c:355
+#: src/dird/authenticate.c:353
 msgid "Authorization problem: Remote client requires TLS.\n"
 msgstr ""
 
-#: src/dird/authenticate.c:370 src/filed/authenticate.c:156
+#: src/dird/authenticate.c:368 src/filed/authenticate.c:156
 #: src/filed/authenticate.c:267 src/stored/authenticate.c:147
 #: src/stored/authenticate.c:248
 msgid "TLS negotiation failed.\n"
 msgstr ""
 
-#: src/dird/authenticate.c:381
+#: src/dird/authenticate.c:379
 #, c-format
 msgid "Unable to authenticate console \"%s\" at %s:%s:%d.\n"
 msgstr ""
 
-#: src/dird/authenticate.c:386
+#: src/dird/authenticate.c:384
 #, c-format
 msgid "1000 OK: %s Version: %s (%s)\n"
 msgstr ""
 
-#: src/dird/autoprune.c:64
+#: src/dird/autoprune.c:63
 msgid "Begin pruning Jobs.\n"
 msgstr ""
 
-#: src/dird/autoprune.c:72
+#: src/dird/autoprune.c:71
 msgid "Begin pruning Files.\n"
 msgstr ""
 
-#: src/dird/autoprune.c:77
+#: src/dird/autoprune.c:76
 msgid ""
 "End auto prune.\n"
 "\n"
 msgstr ""
 
-#: src/dird/backup.c:87 src/dird/job.c:937 src/dird/job.c:976
-#: src/dird/migrate.c:229 src/dird/migrate.c:230
+#: src/dird/backup.c:87 src/dird/job.c:868 src/dird/job.c:914
+#: src/dird/migrate.c:230 src/dird/migrate.c:231
 msgid "Pool resource"
 msgstr ""
 
@@ -758,50 +783,51 @@ msgstr ""
 msgid "Start Backup JobId %s, Job=%s\n"
 msgstr ""
 
-#: src/dird/backup.c:281
+#: src/dird/backup.c:286
 #, c-format
 msgid "Unexpected Client Job message: %s\n"
 msgstr ""
 
-#: src/dird/backup.c:290
+#: src/dird/backup.c:295
 #, c-format
 msgid "Network error with FD during %s: ERR=%s\n"
 msgstr ""
 
-#: src/dird/backup.c:308
+#: src/dird/backup.c:313
 msgid "No Job status returned from FD.\n"
 msgstr ""
 
-#: src/dird/backup.c:357
+#: src/dird/backup.c:362
 #, c-format
-msgid "Error getting client record for stats: %s"
+msgid "Error getting Client record for Job report: ERR=%s"
 msgstr ""
 
-#: src/dird/backup.c:363 src/dird/migrate.c:1067
+#: src/dird/backup.c:368 src/dird/migrate.c:1106
 #, c-format
 msgid "Error getting Media record for Volume \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/backup.c:373
+#: src/dird/backup.c:378
 msgid "Backup OK -- with warnings"
 msgstr ""
 
-#: src/dird/backup.c:375 src/stored/bscan.c:1114
+#: src/dird/backup.c:380 src/stored/bscan.c:1124
 msgid "Backup OK"
 msgstr ""
 
-#: src/dird/backup.c:380 src/stored/bscan.c:1118
+#: src/dird/backup.c:385 src/stored/bscan.c:1128
 msgid "*** Backup Error ***"
 msgstr ""
 
-#: src/dird/backup.c:390 src/stored/bscan.c:1121
+#: src/dird/backup.c:395 src/stored/bscan.c:1131
 msgid "Backup Canceled"
 msgstr ""
 
-#: src/dird/backup.c:440
+#: src/dird/backup.c:445
 #, c-format
 msgid ""
-"Bacula %s (%s): %s\n"
+"Bacula %s %s (%s): %s\n"
+"  Build OS:               %s %s %s\n"
 "  JobId:                  %d\n"
 "  Job:                    %s\n"
 "  Backup Level:           %s%s\n"
@@ -834,12 +860,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/backup.c:536
+#: src/dird/backup.c:541
 #, c-format
 msgid "Could not get Job Volume Parameters to update Bootstrap file. ERR=%s\n"
 msgstr ""
 
-#: src/dird/backup.c:570
+#: src/dird/backup.c:575
 #, c-format
 msgid ""
 "Could not open WriteBootstrap file:\n"
@@ -885,108 +911,112 @@ msgstr ""
 msgid "No Volumes found to restore.\n"
 msgstr ""
 
-#: src/dird/catreq.c:128 src/dird/catreq.c:327
+#: src/dird/catreq.c:129 src/dird/catreq.c:331
 #, c-format
 msgid "1990 Invalid Catalog Request: %s"
 msgstr ""
 
-#: src/dird/catreq.c:129
+#: src/dird/catreq.c:130
 #, c-format
 msgid "Invalid Catalog request; DB not open: %s"
 msgstr ""
 
-#: src/dird/catreq.c:153
+#: src/dird/catreq.c:154
 msgid "1901 No Media.\n"
 msgstr ""
 
-#: src/dird/catreq.c:181
+#: src/dird/catreq.c:182
 msgid "not in Pool"
 msgstr ""
 
-#: src/dird/catreq.c:183
+#: src/dird/catreq.c:184
 msgid "not correct MediaType"
 msgstr ""
 
-#: src/dird/catreq.c:199
+#: src/dird/catreq.c:194
+msgid "is not Enabled"
+msgstr ""
+
+#: src/dird/catreq.c:203
 #, c-format
 msgid "1998 Volume \"%s\" status is %s, %s.\n"
 msgstr ""
 
-#: src/dird/catreq.c:204
+#: src/dird/catreq.c:208
 #, c-format
 msgid "1997 Volume \"%s\" not in catalog.\n"
 msgstr ""
 
-#: src/dird/catreq.c:226
+#: src/dird/catreq.c:230
 #, c-format
 msgid "Unable to get Media record for Volume %s: ERR=%s\n"
 msgstr ""
 
-#: src/dird/catreq.c:228
+#: src/dird/catreq.c:232
 #, c-format
 msgid "1991 Catalog Request for vol=%s failed: %s"
 msgstr ""
 
-#: src/dird/catreq.c:255
+#: src/dird/catreq.c:259
 #, c-format
 msgid ""
 "Volume Files at %u being set to %u for Volume \"%s\". This is incorrect.\n"
 msgstr ""
 
-#: src/dird/catreq.c:258
+#: src/dird/catreq.c:262
 #, c-format
 msgid "1992 Update Media error. VolFiles=%u, CatFiles=%u\n"
 msgstr ""
 
-#: src/dird/catreq.c:290
+#: src/dird/catreq.c:294
 #, c-format
 msgid "Catalog error updating Media record. %s"
 msgstr ""
 
-#: src/dird/catreq.c:292
+#: src/dird/catreq.c:296
 msgid "1993 Update Media error\n"
 msgstr ""
 
-#: src/dird/catreq.c:316
+#: src/dird/catreq.c:320
 #, c-format
 msgid "Catalog error creating JobMedia record. %s"
 msgstr ""
 
-#: src/dird/catreq.c:318
+#: src/dird/catreq.c:322
 msgid "1991 Update JobMedia error\n"
 msgstr ""
 
-#: src/dird/catreq.c:328
+#: src/dird/catreq.c:332
 #, c-format
 msgid "Invalid Catalog request: %s"
 msgstr ""
 
-#: src/dird/catreq.c:362
+#: src/dird/catreq.c:367
 #, c-format
 msgid "1991 Invalid Catalog Update: %s"
 msgstr ""
 
-#: src/dird/catreq.c:363
+#: src/dird/catreq.c:368
 #, c-format
 msgid "Invalid Catalog Update; DB not open: %s"
 msgstr ""
 
-#: src/dird/catreq.c:436
+#: src/dird/catreq.c:441
 #, c-format
 msgid "Got %s but not same File as attributes\n"
 msgstr ""
 
-#: src/dird/catreq.c:462
+#: src/dird/catreq.c:467
 #, c-format
 msgid "Catalog error updating file digest. Unsupported digest stream type: %d"
 msgstr ""
 
-#: src/dird/catreq.c:478
+#: src/dird/catreq.c:483
 #, c-format
 msgid "Catalog error updating file digest. %s"
 msgstr ""
 
-#: src/dird/dird.c:92
+#: src/dird/dird.c:94
 #, c-format
 msgid ""
 "\n"
@@ -1006,67 +1036,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/dird.c:220 src/console/console.c:423 src/filed/filed.c:180
-#: src/gnome2-console/console.c:286 src/stored/stored.c:208
+#: src/dird/dird.c:224 src/console/console.c:426 src/filed/filed.c:182
+#: src/gnome2-console/console.c:286 src/stored/stored.c:210
 msgid "Cryptography library initialization failed.\n"
 msgstr ""
 
-#: src/dird/dird.c:224 src/dird/dird.c:455 src/dird/dird.c:458
-#: src/console/console.c:427 src/filed/filed.c:185
-#: src/gnome2-console/console.c:290 src/stored/stored.c:212
+#: src/dird/dird.c:228 src/dird/dird.c:234 src/dird/dird.c:474
+#: src/dird/dird.c:477 src/console/console.c:430 src/filed/filed.c:187
+#: src/gnome2-console/console.c:290 src/stored/stored.c:214
 #, c-format
 msgid "Please correct configuration file: %s\n"
 msgstr ""
 
-#: src/dird/dird.c:441
+#: src/dird/dird.c:460
 msgid "Too many open reload requests. Request ignored.\n"
 msgstr ""
 
-#: src/dird/dird.c:456
+#: src/dird/dird.c:475
 msgid "Out of reload table entries. Giving up.\n"
 msgstr ""
 
-#: src/dird/dird.c:459
+#: src/dird/dird.c:478
 msgid "Resetting previous configuration.\n"
 msgstr ""
 
-#: src/dird/dird.c:522
+#: src/dird/dird.c:541
 #, c-format
 msgid ""
 "No Director resource defined in %s\n"
 "Without that I don't know who I am :-(\n"
 msgstr ""
 
-#: src/dird/dird.c:530 src/filed/filed.c:279
+#: src/dird/dird.c:549 src/filed/filed.c:281
 #, c-format
 msgid "No Messages resource defined in %s\n"
 msgstr ""
 
-#: src/dird/dird.c:535
+#: src/dird/dird.c:554
 #, c-format
 msgid "Only one Director resource permitted in %s\n"
 msgstr ""
 
-#: src/dird/dird.c:544 src/dird/dird.c:788 src/dird/dird.c:854
-#: src/dird/dird.c:906 src/console/console.c:641 src/console/console.c:670
-#: src/filed/filed.c:286 src/filed/filed.c:444
+#: src/dird/dird.c:563 src/dird/dird.c:764 src/dird/dird.c:816
+#: src/dird/dird.c:920 src/console/console.c:657 src/console/console.c:686
+#: src/filed/filed.c:288 src/filed/filed.c:446
 #: src/gnome2-console/console.c:153 src/gnome2-console/console.c:182
-#: src/stored/stored.c:330 src/wx-console/console_thread.cpp:114
+#: src/stored/stored.c:332 src/wx-console/console_thread.cpp:114
 #: src/wx-console/console_thread.cpp:140
 msgid "TLS required but not configured in Bacula.\n"
 msgstr ""
 
-#: src/dird/dird.c:550 src/filed/filed.c:453 src/stored/stored.c:382
+#: src/dird/dird.c:569 src/filed/filed.c:455 src/stored/stored.c:384
 #, c-format
 msgid "\"TLS Certificate\" file not defined for Director \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:556 src/filed/filed.c:459 src/stored/stored.c:388
+#: src/dird/dird.c:575 src/filed/filed.c:461 src/stored/stored.c:390
 #, c-format
 msgid "\"TLS Key\" file not defined for Director \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:562 src/filed/filed.c:465 src/stored/stored.c:394
+#: src/dird/dird.c:581 src/filed/filed.c:467 src/stored/stored.c:396
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -1074,136 +1104,136 @@ msgid ""
 "using \"TLS Verify Peer\".\n"
 msgstr ""
 
-#: src/dird/dird.c:581 src/filed/filed.c:484 src/stored/stored.c:413
+#: src/dird/dird.c:600 src/filed/filed.c:486 src/stored/stored.c:415
 #, c-format
 msgid "Failed to initialize TLS context for Director \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:589
+#: src/dird/dird.c:608
 #, c-format
 msgid "No Job records defined in %s\n"
 msgstr ""
 
-#: src/dird/dird.c:647 src/dird/dird.c:660
+#: src/dird/dird.c:666 src/dird/dird.c:679
 #, c-format
 msgid "Hey something is wrong. p=0x%lu\n"
 msgstr ""
 
-#: src/dird/dird.c:719
+#: src/dird/dird.c:738
 #, c-format
 msgid "\"%s\" directive in Job \"%s\" resource is required, but not found.\n"
 msgstr ""
 
-#: src/dird/dird.c:726
+#: src/dird/dird.c:745
 msgid "Too many items in Job resource\n"
 msgstr ""
 
-#: src/dird/dird.c:730
+#: src/dird/dird.c:749
 #, c-format
 msgid "No storage specified in Job \"%s\" nor in Pool.\n"
 msgstr ""
 
-#: src/dird/dird.c:749
+#: src/dird/dird.c:771
 #, c-format
-msgid "Could not open Catalog \"%s\", database \"%s\".\n"
+msgid "\"TLS Certificate\" file not defined for Console \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:752
+#: src/dird/dird.c:777
 #, c-format
-msgid "%s"
+msgid "\"TLS Key\" file not defined for Console \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:794
+#: src/dird/dird.c:783
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
-"Storage \"%s\" in %s.\n"
+"Console \"%s\" in %s. At least one CA certificate store is required when "
+"using \"TLS Verify Peer\".\n"
 msgstr ""
 
-#: src/dird/dird.c:810 src/stored/stored.c:368
+#: src/dird/dird.c:800 src/dird/dird.c:840 src/filed/filed.c:312
 #, c-format
-msgid "Failed to initialize TLS context for Storage \"%s\" in %s.\n"
+msgid "Failed to initialize TLS context for File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:861
+#: src/dird/dird.c:823
 #, c-format
-msgid "\"TLS Certificate\" file not defined for Console \"%s\" in %s.\n"
+msgid ""
+"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
+"File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:867
+#: src/dird/dird.c:872 src/dird/dird.c:874
 #, c-format
-msgid "\"TLS Key\" file not defined for Console \"%s\" in %s.\n"
+msgid "Could not open Catalog \"%s\", database \"%s\".\n"
 msgstr ""
 
-#: src/dird/dird.c:873
+#: src/dird/dird.c:877
 #, c-format
-msgid ""
-"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
-"Console \"%s\" in %s. At least one CA certificate store is required when "
-"using \"TLS Verify Peer\".\n"
+msgid "%s"
 msgstr ""
 
-#: src/dird/dird.c:890 src/dird/dird.c:930 src/filed/filed.c:310
+#: src/dird/dird.c:926
 #, c-format
-msgid "Failed to initialize TLS context for File daemon \"%s\" in %s.\n"
+msgid ""
+"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
+"Storage \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:913
+#: src/dird/dird.c:942 src/stored/stored.c:370
 #, c-format
-msgid ""
-"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
-"File daemon \"%s\" in %s.\n"
+msgid "Failed to initialize TLS context for Storage \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:498 src/tray-monitor/tray_conf.c:160
+#: src/dird/dird_conf.c:508 src/tray-monitor/tray_conf.c:168
 #, c-format
 msgid "No %s resource defined\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:507
+#: src/dird/dird_conf.c:517
 #, c-format
 msgid "Director: name=%s MaxJobs=%d FDtimeout=%s SDtimeout=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:512
+#: src/dird/dird_conf.c:522
 #, c-format
 msgid "   query_file=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:515 src/dird/dird_conf.c:535 src/dird/dird_conf.c:549
-#: src/dird/dird_conf.c:597 src/dird/dird_conf.c:601 src/dird/dird_conf.c:605
-#: src/dird/dird_conf.c:620 src/dird/dird_conf.c:637 src/dird/dird_conf.c:641
-#: src/dird/dird_conf.c:645 src/dird/dird_conf.c:649 src/dird/dird_conf.c:653
-#: src/dird/dird_conf.c:666 src/dird/dird_conf.c:856 src/dird/dird_conf.c:862
+#: src/dird/dird_conf.c:525 src/dird/dird_conf.c:545 src/dird/dird_conf.c:559
+#: src/dird/dird_conf.c:607 src/dird/dird_conf.c:611 src/dird/dird_conf.c:615
+#: src/dird/dird_conf.c:633 src/dird/dird_conf.c:650 src/dird/dird_conf.c:654
+#: src/dird/dird_conf.c:658 src/dird/dird_conf.c:662 src/dird/dird_conf.c:666
+#: src/dird/dird_conf.c:679 src/dird/dird_conf.c:880
 msgid "  --> "
 msgstr ""
 
-#: src/dird/dird_conf.c:520
+#: src/dird/dird_conf.c:530
 #, c-format
 msgid "Console: name=%s SSL=%d\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:525
+#: src/dird/dird_conf.c:535
 #, c-format
 msgid "Counter: name=%s min=%d max=%d cur=%d wrapcntr=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:530
+#: src/dird/dird_conf.c:540
 #, c-format
 msgid "Counter: name=%s min=%d max=%d\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:541
+#: src/dird/dird_conf.c:551
 #, c-format
 msgid "Client: name=%s address=%s FDport=%d MaxJobs=%u\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:544
+#: src/dird/dird_conf.c:554
 #, c-format
 msgid "      JobRetention=%s FileRetention=%s AutoPrune=%d\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:556
+#: src/dird/dird_conf.c:566
 #, c-format
 msgid ""
 "Device: name=%s ok=%d num_writers=%d max_writers=%d\n"
@@ -1212,343 +1242,359 @@ msgid ""
 "      poolid=%s volname=%s MediaType=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:566
+#: src/dird/dird_conf.c:576
 #, c-format
 msgid ""
 "Storage: name=%s address=%s SDport=%d MaxJobs=%u\n"
 "      DeviceName=%s MediaType=%s StorageId=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:575
+#: src/dird/dird_conf.c:585
 #, c-format
 msgid ""
 "Catalog: name=%s address=%s DBport=%d db_name=%s\n"
 "      db_user=%s MutliDBConn=%d\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:583
+#: src/dird/dird_conf.c:593
 #, c-format
 msgid "%s: name=%s JobType=%d level=%s Priority=%d Enabled=%d\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:584 src/dird/ua_cmds.c:455 src/dird/ua_prune.c:427
-#: src/dird/ua_run.c:576 src/dird/ua_select.c:250 src/dird/ua_select.c:273
+#: src/dird/dird_conf.c:594 src/dird/ua_cmds.c:478 src/dird/ua_prune.c:365
+#: src/dird/ua_run.c:266 src/dird/ua_select.c:263 src/dird/ua_select.c:286
 msgid "Job"
 msgstr ""
 
-#: src/dird/dird_conf.c:584
+#: src/dird/dird_conf.c:594
 msgid "JobDefs"
 msgstr ""
 
-#: src/dird/dird_conf.c:588
+#: src/dird/dird_conf.c:598
 #, c-format
 msgid ""
 "     MaxJobs=%u Resched=%d Times=%d Interval=%s Spool=%d WritePartAfterJob=%"
 "d\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:594
+#: src/dird/dird_conf.c:604
 #, c-format
 msgid "     SelectionType=%d\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:609
+#: src/dird/dird_conf.c:619
 #, c-format
 msgid "  --> Where=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:612
+#: src/dird/dird_conf.c:622
+#, c-format
+msgid "  --> RegexWhere=%s\n"
+msgstr ""
+
+#: src/dird/dird_conf.c:625
 #, c-format
 msgid "  --> Bootstrap=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:615
+#: src/dird/dird_conf.c:628
 #, c-format
 msgid "  --> WriteBootstrap=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:627 src/lib/runscript.c:253
+#: src/dird/dird_conf.c:640 src/lib/runscript.c:261
 msgid " --> RunScript\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:628 src/lib/runscript.c:254
+#: src/dird/dird_conf.c:641 src/lib/runscript.c:262
 #, c-format
 msgid "  --> Command=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:629 src/lib/runscript.c:255
+#: src/dird/dird_conf.c:642 src/lib/runscript.c:263
 #, c-format
 msgid "  --> Target=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:630 src/lib/runscript.c:256
+#: src/dird/dird_conf.c:643 src/lib/runscript.c:264
 #, c-format
 msgid "  --> RunOnSuccess=%u\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:631 src/lib/runscript.c:257
+#: src/dird/dird_conf.c:644 src/lib/runscript.c:265
 #, c-format
 msgid "  --> RunOnFailure=%u\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:632 src/lib/runscript.c:258
+#: src/dird/dird_conf.c:645 src/lib/runscript.c:266
 #, c-format
-msgid "  --> AbortJobOnError=%u\n"
+msgid "  --> FailJobOnError=%u\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:633 src/lib/runscript.c:259
+#: src/dird/dird_conf.c:646 src/lib/runscript.c:267
 #, c-format
 msgid "  --> RunWhen=%u\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:659
+#: src/dird/dird_conf.c:672
 #, c-format
 msgid "  --> Run=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:663
+#: src/dird/dird_conf.c:676
 #, c-format
 msgid "  --> SelectionPattern=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:673
+#: src/dird/dird_conf.c:686
 #, c-format
 msgid "FileSet: name=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:750 src/dird/dird_conf.c:829
+#: src/dird/dird_conf.c:763 src/dird/dird_conf.c:842
 #, c-format
 msgid "Schedule: name=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:755
+#: src/dird/dird_conf.c:768
 #, c-format
 msgid "  --> Run Level=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:756
+#: src/dird/dird_conf.c:769
 msgid "      hour="
 msgstr ""
 
-#: src/dird/dird_conf.c:765
+#: src/dird/dird_conf.c:778
 msgid "      mday="
 msgstr ""
 
-#: src/dird/dird_conf.c:774
+#: src/dird/dird_conf.c:787
 msgid "      month="
 msgstr ""
 
-#: src/dird/dird_conf.c:783
+#: src/dird/dird_conf.c:796
 msgid "      wday="
 msgstr ""
 
-#: src/dird/dird_conf.c:792
+#: src/dird/dird_conf.c:805
 msgid "      wom="
 msgstr ""
 
-#: src/dird/dird_conf.c:801
+#: src/dird/dird_conf.c:814
 msgid "      woy="
 msgstr ""
 
-#: src/dird/dird_conf.c:810
+#: src/dird/dird_conf.c:823
 #, c-format
 msgid "      mins=%d\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:812 src/dird/dird_conf.c:816 src/dird/dird_conf.c:820
+#: src/dird/dird_conf.c:825 src/dird/dird_conf.c:829 src/dird/dird_conf.c:833
 msgid "     --> "
 msgstr ""
 
-#: src/dird/dird_conf.c:833
+#: src/dird/dird_conf.c:846
 #, c-format
 msgid "Pool: name=%s PoolType=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:835
+#: src/dird/dird_conf.c:848
 #, c-format
 msgid "      use_cat=%d use_once=%d cat_files=%d\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:838
+#: src/dird/dird_conf.c:851
 #, c-format
 msgid "      max_vols=%d auto_prune=%d VolRetention=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:841
+#: src/dird/dird_conf.c:854
 #, c-format
 msgid "      VolUse=%s recycle=%d LabelFormat=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:845
+#: src/dird/dird_conf.c:858
 #, c-format
 msgid "      CleaningPrefix=%s LabelType=%d\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:847
+#: src/dird/dird_conf.c:860
 #, c-format
-msgid "      RecyleOldest=%d PurgeOldest=%d MaxVolJobs=%d MaxVolFiles=%d\n"
+msgid "      RecyleOldest=%d PurgeOldest=%d\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:851
+#: src/dird/dird_conf.c:863
+#, c-format
+msgid "      MaxVolJobs=%d MaxVolFiles=%d MaxVolBytes=%s\n"
+msgstr ""
+
+#: src/dird/dird_conf.c:867
 #, c-format
 msgid "      MigTime=%s MigHiBytes=%s MigLoBytes=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:868
+#: src/dird/dird_conf.c:872
+#, c-format
+msgid "      NextPool=%s\n"
+msgstr ""
+
+#: src/dird/dird_conf.c:875
+#, c-format
+msgid "      RecyclePool=%s\n"
+msgstr ""
+
+#: src/dird/dird_conf.c:886
 #, c-format
 msgid "Messages: name=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:870
+#: src/dird/dird_conf.c:888
 #, c-format
 msgid "      mailcmd=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:872
+#: src/dird/dird_conf.c:890
 #, c-format
 msgid "      opcmd=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:875 src/tray-monitor/tray_conf.c:187
+#: src/dird/dird_conf.c:893 src/tray-monitor/tray_conf.c:199
 #, c-format
 msgid "Unknown resource type %d in dump_resource.\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1166 src/tray-monitor/tray_conf.c:240
+#: src/dird/dird_conf.c:1199 src/tray-monitor/tray_conf.c:257
 #, c-format
 msgid "Unknown resource type %d in free_resource.\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1198 src/dird/dird_conf.c:1213
-#: src/dird/dird_conf.c:1775 src/console/console_conf.c:255
-#: src/filed/filed_conf.c:347 src/gnome2-console/console_conf.c:259
-#: src/tray-monitor/tray_conf.c:270 src/wx-console/console_conf.c:265
+#: src/dird/dird_conf.c:1231 src/dird/dird_conf.c:1246
+#: src/dird/dird_conf.c:1842 src/console/console_conf.c:257
+#: src/filed/filed_conf.c:347 src/gnome2-console/console_conf.c:258
+#: src/tray-monitor/tray_conf.c:288 src/wx-console/console_conf.c:265
 #, c-format
 msgid "%s item is required in %s resource, but not found.\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1204 src/lib/parse_conf.c:233
-#: src/tray-monitor/tray_conf.c:276
+#: src/dird/dird_conf.c:1237 src/lib/parse_conf.c:234
+#: src/tray-monitor/tray_conf.c:294
 #, c-format
 msgid "Too many items in %s resource\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1244
+#: src/dird/dird_conf.c:1277
 #, c-format
 msgid "Cannot find Pool resource %s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1252
+#: src/dird/dird_conf.c:1286
 #, c-format
 msgid "Cannot find Console resource %s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1258 src/filed/filed_conf.c:367
-#: src/stored/stored_conf.c:583
+#: src/dird/dird_conf.c:1292 src/filed/filed_conf.c:367
+#: src/stored/stored_conf.c:584
 #, c-format
 msgid "Cannot find Director resource %s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1265 src/stored/stored_conf.c:589
+#: src/dird/dird_conf.c:1299 src/stored/stored_conf.c:590
 #, c-format
 msgid "Cannot find Storage resource %s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1274
+#: src/dird/dird_conf.c:1308
 #, c-format
 msgid "Cannot find Job resource %s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1293
+#: src/dird/dird_conf.c:1357
 #, c-format
 msgid "Cannot find Counter resource %s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1301 src/filed/filed_conf.c:373
+#: src/dird/dird_conf.c:1365 src/filed/filed_conf.c:373
 #, c-format
 msgid "Cannot find Client resource %s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1313
+#: src/dird/dird_conf.c:1378
 #, c-format
 msgid "Cannot find Schedule resource %s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1318 src/tray-monitor/tray_conf.c:295
+#: src/dird/dird_conf.c:1383 src/dird/dird_conf.c:1443
+#: src/tray-monitor/tray_conf.c:314 src/tray-monitor/tray_conf.c:352
 #, c-format
 msgid "Unknown resource type %d in save_resource.\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1378 src/tray-monitor/tray_conf.c:330
-#, c-format
-msgid "Unknown resource type %d in save_resrouce.\n"
-msgstr ""
-
-#: src/dird/dird_conf.c:1393
+#: src/dird/dird_conf.c:1458
 #, c-format
 msgid "Name item is required in %s resource, but not found.\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1400 src/console/console_conf.c:317
-#: src/filed/filed_conf.c:431 src/gnome2-console/console_conf.c:327
-#: src/tray-monitor/tray_conf.c:349 src/wx-console/console_conf.c:327
+#: src/dird/dird_conf.c:1466 src/console/console_conf.c:320
+#: src/filed/filed_conf.c:432 src/gnome2-console/console_conf.c:327
+#: src/tray-monitor/tray_conf.c:372 src/wx-console/console_conf.c:328
 #, c-format
 msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1405
+#: src/dird/dird_conf.c:1471
 #, c-format
 msgid "Inserting %s res: %s index=%d pass=%d\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1477
+#: src/dird/dird_conf.c:1543
 #, c-format
 msgid "Expected a Migration Job Type keyword, got: %s"
 msgstr ""
 
-#: src/dird/dird_conf.c:1503
+#: src/dird/dird_conf.c:1569
 #, c-format
 msgid "Expected a Job Type keyword, got: %s"
 msgstr ""
 
-#: src/dird/dird_conf.c:1527
+#: src/dird/dird_conf.c:1593
 #, c-format
 msgid "Expected a Job Level keyword, got: %s"
 msgstr ""
 
-#: src/dird/dird_conf.c:1547
+#: src/dird/dird_conf.c:1613
 #, c-format
 msgid "Expected a Restore replacement option, got: %s"
 msgstr ""
 
-#: src/dird/dird_conf.c:1595 src/dird/dird_conf.c:1705
-#: src/lib/parse_conf.c:722 src/lib/parse_conf.c:737
+#: src/dird/dird_conf.c:1661 src/dird/dird_conf.c:1771
+#: src/lib/parse_conf.c:723 src/lib/parse_conf.c:738
 #, c-format
 msgid "Expect %s, got: %s"
 msgstr ""
 
-#: src/dird/dird_conf.c:1617 src/lib/parse_conf.c:481
+#: src/dird/dird_conf.c:1683 src/lib/parse_conf.c:482
 #, c-format
 msgid "Could not find config Resource %s referenced on line %d : %s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1744 src/dird/inc_conf.c:630
+#: src/dird/dird_conf.c:1811 src/dird/inc_conf.c:645
 #, c-format
 msgid "Expecting open brace. Got %s"
 msgstr ""
 
-#: src/dird/dird_conf.c:1752 src/dird/inc_conf.c:345 src/dird/inc_conf.c:645
+#: src/dird/dird_conf.c:1819 src/dird/inc_conf.c:360 src/dird/inc_conf.c:660
 #, c-format
 msgid "Expecting keyword, got: %s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1758 src/dird/inc_conf.c:353 src/dird/inc_conf.c:651
-#: src/lib/parse_conf.c:869
+#: src/dird/dird_conf.c:1825 src/dird/inc_conf.c:368 src/dird/inc_conf.c:666
+#: src/lib/parse_conf.c:874
 #, c-format
 msgid "expected an equals, got: %s"
 msgstr ""
 
-#: src/dird/dird_conf.c:1769 src/dird/inc_conf.c:363 src/dird/inc_conf.c:660
+#: src/dird/dird_conf.c:1836 src/dird/inc_conf.c:378 src/dird/inc_conf.c:675
 #, c-format
 msgid "Keyword %s not permitted in this resource"
 msgstr ""
@@ -1588,160 +1634,170 @@ msgstr ""
 msgid "Cannot destroy var context: ERR=%s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:85 src/tray-monitor/tray-monitor.c:881
+#: src/dird/fd_cmds.c:94 src/tray-monitor/tray-monitor.c:914
 msgid "File daemon"
 msgstr ""
 
-#: src/dird/fd_cmds.c:116
+#: src/dird/fd_cmds.c:125
 #, c-format
 msgid "File daemon \"%s\" rejected Job command: %s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:129
+#: src/dird/fd_cmds.c:138
 #, c-format
 msgid "Error updating Client record. ERR=%s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:134
+#: src/dird/fd_cmds.c:143
 #, c-format
 msgid "FD gave bad response to JobId command: %s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:156 src/dird/fd_cmds.c:192
+#: src/dird/fd_cmds.c:165 src/dird/fd_cmds.c:201
 msgid ", since="
 msgstr ""
 
-#: src/dird/fd_cmds.c:176
+#: src/dird/fd_cmds.c:185
 msgid "No prior or suitable Full backup found in catalog. Doing FULL backup.\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:177 src/dird/fd_cmds.c:185
+#: src/dird/fd_cmds.c:186 src/dird/fd_cmds.c:194
 #, c-format
 msgid " (upgraded from %s)"
 msgstr ""
 
-#: src/dird/fd_cmds.c:183
+#: src/dird/fd_cmds.c:192
 #, c-format
 msgid "Prior failed job found in catalog. Upgrading to %s.\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:244
+#: src/dird/fd_cmds.c:253
 #, c-format
 msgid "Unimplemented backup level %d %c\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:347 src/filed/job.c:615
+#: src/dird/fd_cmds.c:356 src/filed/job.c:640
 #, c-format
 msgid "Cannot run program: %s. ERR=%s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:358 src/dird/fd_cmds.c:383 src/dird/fd_cmds.c:397
+#: src/dird/fd_cmds.c:367 src/dird/fd_cmds.c:392 src/dird/fd_cmds.c:406
 msgid ">filed: write error on socket\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:364
+#: src/dird/fd_cmds.c:373
 #, c-format
 msgid "Error running program: %s. ERR=%s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:373
+#: src/dird/fd_cmds.c:382
 #, c-format
 msgid "Cannot open included file: %s. ERR=%s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:468 src/filed/job.c:1771
+#: src/dird/fd_cmds.c:477 src/filed/job.c:1831
 #, c-format
 msgid "Could not open bootstrap file %s: ERR=%s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:610
+#: src/dird/fd_cmds.c:583
+#, c-format
+msgid "Client \"%s\" RunScript failed.\n"
+msgstr ""
+
+#: src/dird/fd_cmds.c:619
 #, c-format
 msgid ""
 "<filed: bad attributes, expected 3 fields got %d\n"
 "msglen=%d msg=%s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:655
+#: src/dird/fd_cmds.c:674
 #, c-format
 msgid "%s index %d not same as attributes %d\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:672
+#: src/dird/fd_cmds.c:688
 #, c-format
 msgid "<filed: Network error getting attributes. ERR=%s\n"
 msgstr ""
 
-#: src/dird/getmsg.c:143
+#: src/dird/getmsg.c:145
 #, c-format
 msgid "bget_dirmsg: unknown bnet signal %d\n"
 msgstr ""
 
-#: src/dird/getmsg.c:161 src/dird/getmsg.c:174 src/dird/getmsg.c:186
-#: src/dird/getmsg.c:233 src/dird/getmsg.c:257
+#: src/dird/getmsg.c:163 src/dird/getmsg.c:176 src/dird/getmsg.c:188
+#: src/dird/getmsg.c:235 src/dird/getmsg.c:262
 #, c-format
 msgid "Malformed message: %s\n"
 msgstr ""
 
-#: src/dird/getmsg.c:167
+#: src/dird/getmsg.c:169
 #, c-format
 msgid "Job not found: %s\n"
 msgstr ""
 
-#: src/dird/getmsg.c:324
+#: src/dird/getmsg.c:333
 #, c-format
 msgid "Bad response to %s command: wanted %s, got %s\n"
 msgstr ""
 
-#: src/dird/getmsg.c:329
+#: src/dird/getmsg.c:338
 #, c-format
 msgid "Socket error on %s command: ERR=%s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:284
+#: src/dird/inc_conf.c:279
+#, c-format
+msgid "Expected a strip path positive integer, got:%s:"
+msgstr ""
+
+#: src/dird/inc_conf.c:299
 #, c-format
 msgid "Expected a FileSet option keyword, got:%s:"
 msgstr ""
 
-#: src/dird/inc_conf.c:317
+#: src/dird/inc_conf.c:332
 msgid "Old style Include/Exclude not supported\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:416
+#: src/dird/inc_conf.c:431
 #, c-format
 msgid "Regex compile error. ERR=%s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:437
+#: src/dird/inc_conf.c:452
 #, c-format
 msgid "Expected a regex string, got: %s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:529
+#: src/dird/inc_conf.c:544
 #, c-format
 msgid "Expected a wild-card string, got: %s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:552
+#: src/dird/inc_conf.c:567
 #, c-format
 msgid "Expected an fstype string, got: %s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:575
+#: src/dird/inc_conf.c:590
 #, c-format
 msgid "Expected an drivetype string, got: %s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:599
+#: src/dird/inc_conf.c:614
 #, c-format
 msgid "Backslash found. Use forward slashes or quote the string.: %s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:614
+#: src/dird/inc_conf.c:629
 #, c-format
 msgid "Expected a filename, got: %s"
 msgstr ""
 
-#: src/dird/inc_conf.c:685
+#: src/dird/inc_conf.c:700
 #, c-format
 msgid "Expected a FileSet keyword, got: %s"
 msgstr ""
@@ -1756,133 +1812,124 @@ msgstr ""
 msgid "Could not add job queue: ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:113 src/dird/jobq.c:228 src/stored/dircmd.c:186
-#: src/stored/stored.c:472
+#: src/dird/job.c:113 src/dird/jobq.c:228 src/stored/dircmd.c:189
+#: src/stored/stored.c:474
 #, c-format
 msgid "Unable to init job cond variable: ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:131 src/dird/ua_output.c:619
-#, c-format
-msgid "Could not open database \"%s\".\n"
-msgstr ""
-
-#: src/dird/job.c:145 src/dird/job.c:151 src/dird/job.c:969
-#: src/dird/ua_cmds.c:690 src/dird/ua_cmds.c:1328 src/dird/ua_status.c:294
+#: src/dird/job.c:146 src/dird/job.c:152 src/dird/job.c:894 src/dird/job.c:906
+#: src/dird/ua_cmds.c:782 src/dird/ua_cmds.c:1445 src/dird/ua_dotcmds.c:174
+#: src/dird/ua_status.c:308
 msgid "unknown source"
 msgstr ""
 
-#: src/dird/job.c:209 src/dird/job.c:327
+#: src/dird/job.c:210 src/dird/job.c:328
 #, c-format
 msgid "Unimplemented job type: %d\n"
 msgstr ""
 
-#: src/dird/job.c:251
+#: src/dird/job.c:252
 msgid "Job canceled because max start delay time exceeded.\n"
 msgstr ""
 
-#: src/dird/job.c:366
+#: src/dird/job.c:369
 #, c-format
 msgid "JobId %s, Job %s marked to be canceled.\n"
 msgstr ""
 
-#: src/dird/job.c:376
+#: src/dird/job.c:379
 msgid "Failed to connect to File daemon.\n"
 msgstr ""
 
-#: src/dird/job.c:394 src/dird/job.c:396 src/dird/job.c:940 src/dird/job.c:974
-#: src/dird/job.c:983
+#: src/dird/job.c:397 src/dird/job.c:399 src/dird/job.c:871 src/dird/job.c:912
+#: src/dird/job.c:921
 msgid "Job resource"
 msgstr ""
 
-#: src/dird/job.c:411 src/dird/ua_cmds.c:696 src/dird/ua_cmds.c:1342
-#: src/dird/ua_label.c:753
+#: src/dird/job.c:412 src/dird/ua_cmds.c:788 src/dird/ua_cmds.c:1456
+#: src/dird/ua_dotcmds.c:180 src/dird/ua_label.c:759
 msgid "Failed to connect to Storage daemon.\n"
 msgstr ""
 
-#: src/dird/job.c:456
+#: src/dird/job.c:458
 msgid "Max wait time exceeded. Job canceled.\n"
 msgstr ""
 
-#: src/dird/job.c:461
+#: src/dird/job.c:463
 msgid "Max run time exceeded. Job canceled.\n"
 msgstr ""
 
-#: src/dird/job.c:555 src/dird/job.c:604
-#, c-format
-msgid "Unhandled job status code %d\n"
-msgstr ""
-
-#: src/dird/job.c:630 src/dird/ua_output.c:630
+#: src/dird/job.c:548 src/dird/ua_output.c:641
 #, c-format
 msgid "Pool %s not in database. %s"
 msgstr ""
 
-#: src/dird/job.c:634 src/dird/ua_output.c:638
+#: src/dird/job.c:552 src/dird/ua_output.c:649
 #, c-format
 msgid "Pool %s created in database.\n"
 msgstr ""
 
-#: src/dird/job.c:643 src/dird/job.c:927
+#: src/dird/job.c:561 src/dird/job.c:858
 msgid "Run pool override"
 msgstr ""
 
-#: src/dird/job.c:653
+#: src/dird/job.c:571
 msgid "Run FullPool override"
 msgstr ""
 
-#: src/dird/job.c:655
+#: src/dird/job.c:573
 msgid "Job FullPool override"
 msgstr ""
 
-#: src/dird/job.c:663
+#: src/dird/job.c:581
 msgid "Run IncPool override"
 msgstr ""
 
-#: src/dird/job.c:665
+#: src/dird/job.c:583
 msgid "Job IncPool override"
 msgstr ""
 
-#: src/dird/job.c:673
+#: src/dird/job.c:591
 msgid "Run DiffPool override"
 msgstr ""
 
-#: src/dird/job.c:675
+#: src/dird/job.c:593
 msgid "Job DiffPool override"
 msgstr ""
 
-#: src/dird/job.c:700 src/stored/bscan.c:962
+#: src/dird/job.c:618 src/stored/bscan.c:972
 #, c-format
 msgid "Could not create Client record. ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:736
+#: src/dird/job.c:654
 msgid "FileSet MD5 digest not found.\n"
 msgstr ""
 
-#: src/dird/job.c:741
+#: src/dird/job.c:659
 #, c-format
 msgid "Could not create FileSet \"%s\" record. ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:781
+#: src/dird/job.c:699
 #, c-format
 msgid "Error updating job record. %s"
 msgstr ""
 
-#: src/dird/job.c:932
+#: src/dird/job.c:863
 msgid "Run storage override"
 msgstr ""
 
-#: src/dird/job.c:1045 src/dird/ua_run.c:385
+#: src/dird/job.c:983 src/dird/ua_run.c:1211
 msgid "No storage specified.\n"
 msgstr ""
 
-#: src/dird/job.c:1206
+#: src/dird/job.c:1150
 msgid "Could not start clone job.\n"
 msgstr ""
 
-#: src/dird/job.c:1208
+#: src/dird/job.c:1152
 #, c-format
 msgid "Clone JobId %d started.\n"
 msgstr ""
@@ -1943,16 +1990,16 @@ msgstr ""
 msgid "pthread_create: ERR=%s\n"
 msgstr ""
 
-#: src/dird/jobq.c:515
+#: src/dird/jobq.c:514
 #, c-format
 msgid "Rescheduled Job %s at %s to re-run in %d seconds (%s).\n"
 msgstr ""
 
-#: src/dird/jobq.c:544 src/dird/jobq.c:549
+#: src/dird/jobq.c:543 src/dird/jobq.c:548
 msgid "previous Job"
 msgstr ""
 
-#: src/dird/jobq.c:708
+#: src/dird/jobq.c:704
 #, c-format
 msgid ""
 "Job canceled. Attempt to read and write same device.\n"
@@ -1985,158 +2032,160 @@ msgstr ""
 msgid "Previous Job resource not found for \"%s\".\n"
 msgstr ""
 
-#: src/dird/migrate.c:195
+#: src/dird/migrate.c:197
 msgid "setup job failed.\n"
 msgstr ""
 
-#: src/dird/migrate.c:217
+#: src/dird/migrate.c:218
 #, c-format
 msgid "Pool for JobId %s not in database. ERR=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:224
+#: src/dird/migrate.c:225
 #, c-format
 msgid "Pool resource \"%s\" not found.\n"
 msgstr ""
 
-#: src/dird/migrate.c:247
+#: src/dird/migrate.c:248
 msgid "Job Pool's NextPool resource"
 msgstr ""
 
-#: src/dird/migrate.c:277
+#: src/dird/migrate.c:278
 #, c-format
 msgid "Start Migration JobId %s, Job=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:305
+#: src/dird/migrate.c:306
 #, c-format
 msgid "Read storage \"%s\" same as write storage.\n"
 msgstr ""
 
-#: src/dird/migrate.c:643
+#: src/dird/migrate.c:649
 msgid "No Migration SQL selection pattern specified.\n"
 msgstr ""
 
-#: src/dird/migrate.c:650 src/dird/migrate.c:670 src/dird/migrate.c:691
-#: src/dird/migrate.c:730 src/dird/migrate.c:756 src/dird/migrate.c:870
-#: src/dird/migrate.c:897 src/dird/migrate.c:993
+#: src/dird/migrate.c:656 src/dird/migrate.c:676 src/dird/migrate.c:697
+#: src/dird/migrate.c:733 src/dird/migrate.c:761 src/dird/migrate.c:877
+#: src/dird/migrate.c:910 src/dird/migrate.c:1007
 #, c-format
 msgid "SQL failed. ERR=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:674 src/dird/migrate.c:681 src/dird/migrate.c:695
-#: src/dird/migrate.c:760
+#: src/dird/migrate.c:680 src/dird/migrate.c:687 src/dird/migrate.c:701
+#: src/dird/migrate.c:765
 msgid "No Volumes found to migrate.\n"
 msgstr ""
 
-#: src/dird/migrate.c:709
-msgid "Invalid MediaId found.\n"
+#: src/dird/migrate.c:715 src/dird/migrate.c:800 src/dird/migrate.c:813
+msgid "Invalid JobId found.\n"
 msgstr ""
 
-#: src/dird/migrate.c:767
+#: src/dird/migrate.c:772
 msgid "Unknown Migration Selection Type.\n"
 msgstr ""
 
-#: src/dird/migrate.c:779 src/dird/migrate.c:796 src/dird/migrate.c:809
+#: src/dird/migrate.c:784 src/dird/migrate.c:803 src/dird/migrate.c:816
 msgid "No JobIds found to migrate.\n"
 msgstr ""
 
-#: src/dird/migrate.c:782
+#: src/dird/migrate.c:788
 #, c-format
-msgid "The following %u JobId%s will be migrated: %s\n"
-msgstr ""
-
-#: src/dird/migrate.c:793 src/dird/migrate.c:806
-msgid "Invalid JobId found.\n"
+msgid "The following %u JobId%s were chosen to be migrated: %s\n"
 msgstr ""
 
-#: src/dird/migrate.c:817
+#: src/dird/migrate.c:824
 #, c-format
 msgid "Could not get job record for JobId %s to migrate. ERR=%s"
 msgstr ""
 
-#: src/dird/migrate.c:822
+#: src/dird/migrate.c:829
 #, c-format
 msgid "Migration using JobId=%s Job=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:853
+#: src/dird/migrate.c:860
 msgid "Could not start migration job.\n"
 msgstr ""
 
-#: src/dird/migrate.c:855
+#: src/dird/migrate.c:862
 #, c-format
 msgid "Migration JobId %d started.\n"
 msgstr ""
 
-#: src/dird/migrate.c:874 src/dird/migrate.c:901 src/dird/migrate.c:998
+#: src/dird/migrate.c:881
 #, c-format
-msgid "No %ss found to migrate.\n"
+msgid "No %s found to migrate.\n"
+msgstr ""
+
+#: src/dird/migrate.c:885
+#, c-format
+msgid "SQL error. Expected 1 MediaId got %d\n"
 msgstr ""
 
-#: src/dird/migrate.c:877
+#: src/dird/migrate.c:914 src/dird/migrate.c:1012
 #, c-format
-msgid "SQL logic error. Count should be 1 but is %d\n"
+msgid "No %ss found to migrate.\n"
 msgstr ""
 
-#: src/dird/migrate.c:922
+#: src/dird/migrate.c:936
 #, c-format
 msgid "No Migration %s selection pattern specified.\n"
 msgstr ""
 
-#: src/dird/migrate.c:933
+#: src/dird/migrate.c:947
 #, c-format
 msgid "SQL to get %s failed. ERR=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:938
+#: src/dird/migrate.c:952
 #, c-format
 msgid "Query of Pool \"%s\" returned no Jobs to migrate.\n"
 msgstr ""
 
-#: src/dird/migrate.c:947
+#: src/dird/migrate.c:961
 #, c-format
 msgid "Could not compile regex pattern \"%s\" ERR=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:976
+#: src/dird/migrate.c:990
 msgid "Regex pattern matched no Jobs to migrate.\n"
 msgstr ""
 
-#: src/dird/migrate.c:1089
+#: src/dird/migrate.c:1114
 #, c-format
 msgid "%s OK -- with warnings"
 msgstr ""
 
-#: src/dird/migrate.c:1091
+#: src/dird/migrate.c:1116
 #, c-format
 msgid "%s OK"
 msgstr ""
 
-#: src/dird/migrate.c:1096
+#: src/dird/migrate.c:1121
 #, c-format
 msgid "*** %s Error ***"
 msgstr ""
 
-#: src/dird/migrate.c:1106
+#: src/dird/migrate.c:1131
 #, c-format
 msgid "%s Canceled"
 msgstr ""
 
-#: src/dird/migrate.c:1115
+#: src/dird/migrate.c:1140
 #, c-format
 msgid "Inappropriate %s term code"
 msgstr ""
 
-#: src/dird/migrate.c:1126
+#: src/dird/migrate.c:1151
 #, c-format
 msgid "%s -- no files to migrate"
 msgstr ""
 
-#: src/dird/migrate.c:1142
+#: src/dird/migrate.c:1167
 #, c-format
 msgid ""
-"Bacula %s (%s): %s\n"
+"Bacula %s %s (%s): %s\n"
+"  Build OS:               %s %s %s\n"
 "  Prev Backup JobId:      %s\n"
 "  New Backup JobId:       %s\n"
 "  Migration JobId:        %s\n"
@@ -2165,36 +2214,36 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/migrate.c:1248
+#: src/dird/migrate.c:1273
 #, c-format
 msgid "No Next Pool specification found in Pool \"%s\".\n"
 msgstr ""
 
-#: src/dird/migrate.c:1254
+#: src/dird/migrate.c:1279
 #, c-format
 msgid "No Storage specification found in Next Pool \"%s\".\n"
 msgstr ""
 
-#: src/dird/migrate.c:1260
+#: src/dird/migrate.c:1285
 msgid "Storage from Pool's NextPool resource"
 msgstr ""
 
-#: src/dird/msgchan.c:99 src/filed/job.c:1247
-#: src/tray-monitor/tray-monitor.c:888
+#: src/dird/msgchan.c:106 src/filed/job.c:1301
+#: src/tray-monitor/tray-monitor.c:921
 msgid "Storage daemon"
 msgstr ""
 
-#: src/dird/msgchan.c:190
+#: src/dird/msgchan.c:197
 #, c-format
 msgid "Storage daemon rejected Job command: %s\n"
 msgstr ""
 
-#: src/dird/msgchan.c:197
+#: src/dird/msgchan.c:204
 #, c-format
 msgid "<stored: bad response to Job command: %s\n"
 msgstr ""
 
-#: src/dird/msgchan.c:289
+#: src/dird/msgchan.c:296
 #, c-format
 msgid ""
 "\n"
@@ -2202,14 +2251,19 @@ msgid ""
 "     %s"
 msgstr ""
 
-#: src/dird/msgchan.c:293
+#: src/dird/msgchan.c:300
 #, c-format
 msgid ""
 "\n"
 "     Storage daemon didn't accept Device \"%s\" command.\n"
 msgstr ""
 
-#: src/dird/msgchan.c:316 src/dird/msgchan.c:461
+#: src/dird/msgchan.c:305
+#, c-format
+msgid "Using Device \"%s\"\n"
+msgstr ""
+
+#: src/dird/msgchan.c:325 src/dird/msgchan.c:474
 #, c-format
 msgid "Cannot create message thread: %s\n"
 msgstr ""
@@ -2233,105 +2287,100 @@ msgstr ""
 msgid "Too many failures. Giving up creating Volume name.\n"
 msgstr ""
 
-#: src/dird/next_vol.c:142
+#: src/dird/next_vol.c:145
 #, c-format
 msgid "Purging oldest volume \"%s\"\n"
 msgstr ""
 
-#: src/dird/next_vol.c:148
+#: src/dird/next_vol.c:151
 #, c-format
 msgid "Pruning oldest volume \"%s\"\n"
 msgstr ""
 
-#: src/dird/next_vol.c:167
+#: src/dird/next_vol.c:170
 msgid "We seem to be looping trying to find the next volume. I give up.\n"
 msgstr ""
 
-#: src/dird/next_vol.c:192
+#: src/dird/next_vol.c:196
 #, c-format
 msgid "Max Volume bytes exceeded. Marking Volume \"%s\" as Full.\n"
 msgstr ""
 
-#: src/dird/next_vol.c:199
+#: src/dird/next_vol.c:203
 #, c-format
 msgid "Volume used once. Marking Volume \"%s\" as Used.\n"
 msgstr ""
 
-#: src/dird/next_vol.c:206
+#: src/dird/next_vol.c:210
 #, c-format
 msgid "Max Volume jobs exceeded. Marking Volume \"%s\" as Used.\n"
 msgstr ""
 
-#: src/dird/next_vol.c:213
+#: src/dird/next_vol.c:217
 #, c-format
 msgid "Max Volume files exceeded. Marking Volume \"%s\" as Used.\n"
 msgstr ""
 
-#: src/dird/next_vol.c:223
+#: src/dird/next_vol.c:227
 #, c-format
 msgid "Max configured use duration exceeded. Marking Volume \"%s\" as Used.\n"
 msgstr ""
 
-#: src/dird/next_vol.c:233
+#: src/dird/next_vol.c:237
 #, c-format
 msgid "Catalog error updating volume \"%s\". ERR=%s"
 msgstr ""
 
-#: src/dird/next_vol.c:254
+#: src/dird/next_vol.c:258
 msgid "volume has expired"
 msgstr ""
 
-#: src/dird/next_vol.c:272 src/dird/next_vol.c:308
+#: src/dird/next_vol.c:276 src/dird/next_vol.c:312
 #, c-format
 msgid "Recycled current volume \"%s\"\n"
 msgstr ""
 
-#: src/dird/next_vol.c:277
+#: src/dird/next_vol.c:281
 msgid "and recycling of current volume failed"
 msgstr ""
 
-#: src/dird/next_vol.c:283
+#: src/dird/next_vol.c:287
 msgid "but should be Append, Purged or Recycle"
 msgstr ""
 
-#: src/dird/next_vol.c:311
+#: src/dird/next_vol.c:315
 msgid ""
 "but should be Append, Purged or Recycle (recycling of the current volume "
 "failed)"
 msgstr ""
 
-#: src/dird/next_vol.c:315
+#: src/dird/next_vol.c:319
 msgid ""
 "but should be Append, Purged or Recycle (cannot automatically recycle "
 "current volume, as it still contains unpruned data or the Volume Retention "
 "time has not expired.)"
 msgstr ""
 
-#: src/dird/next_vol.c:356
+#: src/dird/next_vol.c:377
 #, c-format
 msgid "Unable to get Pool record: ERR=%s"
 msgstr ""
 
-#: src/dird/next_vol.c:361
+#: src/dird/next_vol.c:384
 #, c-format
 msgid "Unable add Scratch Volume, Pool \"%s\" full MaxVols=%d\n"
 msgstr ""
 
-#: src/dird/next_vol.c:374
+#: src/dird/next_vol.c:403
 #, c-format
 msgid "Failed to move Scratch Volume. ERR=%s\n"
 msgstr ""
 
-#: src/dird/next_vol.c:378
+#: src/dird/next_vol.c:408
 #, c-format
 msgid "Using Volume \"%s\" from 'Scratch' pool.\n"
 msgstr ""
 
-#: src/dird/next_vol.c:386
-#, c-format
-msgid "Unable to update Volume record: ERR=%s"
-msgstr ""
-
 #: src/dird/pythondir.c:126 src/filed/pythonfd.c:109 src/filed/pythonfd.c:163
 #: src/filed/pythonfd.c:227 src/stored/pythonsd.c:103
 #: src/stored/pythonsd.c:168
@@ -2364,46 +2413,47 @@ msgstr ""
 msgid "Bad JobLevel string"
 msgstr ""
 
-#: src/dird/recycle.c:111
+#: src/dird/recycle.c:112
 #, c-format
 msgid "Recycled volume \"%s\"\n"
 msgstr ""
 
-#: src/dird/restore.c:86
+#: src/dird/restore.c:87
 msgid ""
 "Cannot restore without a bootstrap file.\n"
 "You probably ran a restore job directly. All restore jobs must\n"
 "be run using the restore command.\n"
 msgstr ""
 
-#: src/dird/restore.c:95
+#: src/dird/restore.c:96
 #, c-format
 msgid "Start Restore Job %s\n"
 msgstr ""
 
-#: src/dird/restore.c:239
+#: src/dird/restore.c:252
 msgid "Restore OK -- warning file count mismatch"
 msgstr ""
 
-#: src/dird/restore.c:241
+#: src/dird/restore.c:254
 msgid "Restore OK"
 msgstr ""
 
-#: src/dird/restore.c:246
+#: src/dird/restore.c:259
 msgid "*** Restore Error ***"
 msgstr ""
 
-#: src/dird/restore.c:256
+#: src/dird/restore.c:269
 msgid "Restore Canceled"
 msgstr ""
 
-#: src/dird/restore.c:283
+#: src/dird/restore.c:296
 #, c-format
 msgid ""
-"Bacula %s (%s): %s\n"
+"Bacula %s %s (%s): %s\n"
+"  Build OS:               %s %s %s\n"
 "  JobId:                  %d\n"
 "  Job:                    %s\n"
-"  Client:                 %s\n"
+"  Restore Client:         %s\n"
 "  Start time:             %s\n"
 "  End time:               %s\n"
 "  Files Expected:         %s\n"
@@ -2452,53 +2502,53 @@ msgstr ""
 msgid "Expected a keyword name, got: %s"
 msgstr ""
 
-#: src/dird/run_conf.c:346
+#: src/dird/run_conf.c:348
 msgid "Day number out of range (1-31)"
 msgstr ""
 
-#: src/dird/run_conf.c:363 src/dird/run_conf.c:509
+#: src/dird/run_conf.c:365 src/dird/run_conf.c:520
 msgid "Week number out of range (0-53)"
 msgstr ""
 
-#: src/dird/run_conf.c:378
+#: src/dird/run_conf.c:381
 #, c-format
 msgid "Job type field: %s in run record not found"
 msgstr ""
 
-#: src/dird/run_conf.c:385
+#: src/dird/run_conf.c:388
 #, c-format
 msgid "Unexpected token: %d:%s"
 msgstr ""
 
-#: src/dird/run_conf.c:429
+#: src/dird/run_conf.c:432
 msgid "Time must be preceded by keyword AT."
 msgstr ""
 
-#: src/dird/run_conf.c:437
+#: src/dird/run_conf.c:441
 msgid "Time logic error.\n"
 msgstr ""
 
-#: src/dird/run_conf.c:449 src/dird/run_conf.c:465
+#: src/dird/run_conf.c:456 src/dird/run_conf.c:475
 msgid "Bad time specification."
 msgstr ""
 
-#: src/dird/run_conf.c:478
+#: src/dird/run_conf.c:489
 msgid "Range logic error.\n"
 msgstr ""
 
-#: src/dird/run_conf.c:487
+#: src/dird/run_conf.c:498
 msgid "Bad day range specification."
 msgstr ""
 
-#: src/dird/run_conf.c:534
+#: src/dird/run_conf.c:545
 msgid "Invalid month, week or position day range"
 msgstr ""
 
-#: src/dird/run_conf.c:549
+#: src/dird/run_conf.c:560
 msgid "Invalid month, weekday or position range"
 msgstr ""
 
-#: src/dird/run_conf.c:608
+#: src/dird/run_conf.c:619
 msgid "Unexpected run state\n"
 msgstr ""
 
@@ -2527,192 +2577,196 @@ msgstr ""
 msgid "run override"
 msgstr ""
 
-#: src/dird/scheduler.c:418
+#: src/dird/scheduler.c:420
 msgid "Inserted job"
 msgstr ""
 
-#: src/dird/scheduler.c:426
+#: src/dird/scheduler.c:428
 msgid "Appended job"
 msgstr ""
 
-#: src/dird/scheduler.c:430
+#: src/dird/scheduler.c:432
 msgid "Run queue"
 msgstr ""
 
-#: src/dird/ua_cmds.c:102
+#: src/dird/ua_cmds.c:104
 msgid "add media to a pool"
 msgstr ""
 
-#: src/dird/ua_cmds.c:103
+#: src/dird/ua_cmds.c:105
 msgid "autodisplay [on|off] -- console messages"
 msgstr ""
 
-#: src/dird/ua_cmds.c:104
+#: src/dird/ua_cmds.c:106
 msgid "automount [on|off] -- after label"
 msgstr ""
 
-#: src/dird/ua_cmds.c:105
+#: src/dird/ua_cmds.c:107
 msgid "cancel [<jobid=nnn> | <job=name>] -- cancel a job"
 msgstr ""
 
-#: src/dird/ua_cmds.c:106
+#: src/dird/ua_cmds.c:108
 msgid "create DB Pool from resource"
 msgstr ""
 
-#: src/dird/ua_cmds.c:107
+#: src/dird/ua_cmds.c:109
 msgid "delete [pool=<pool-name> | media volume=<volume-name>]"
 msgstr ""
 
-#: src/dird/ua_cmds.c:108
+#: src/dird/ua_cmds.c:110
 msgid "disable <job=name> -- disable a job"
 msgstr ""
 
-#: src/dird/ua_cmds.c:109
+#: src/dird/ua_cmds.c:111
 msgid "enable <job=name> -- enable a job"
 msgstr ""
 
-#: src/dird/ua_cmds.c:110
+#: src/dird/ua_cmds.c:112
 msgid "performs FileSet estimate, listing gives full listing"
 msgstr ""
 
-#: src/dird/ua_cmds.c:111 src/console/console.c:169
+#: src/dird/ua_cmds.c:113 src/console/console.c:171
 msgid "exit = quit"
 msgstr ""
 
-#: src/dird/ua_cmds.c:112
+#: src/dird/ua_cmds.c:114
 msgid "gui [on|off] -- non-interactive gui mode"
 msgstr ""
 
-#: src/dird/ua_cmds.c:113 src/stored/btape.c:2538
+#: src/dird/ua_cmds.c:115 src/stored/btape.c:2540
 msgid "print this command"
 msgstr ""
 
-#: src/dird/ua_cmds.c:114
+#: src/dird/ua_cmds.c:116
 msgid ""
 "list [pools | jobs | jobtotals | media <pool=pool-name> | files <jobid=nn>]; "
 "from catalog"
 msgstr ""
 
-#: src/dird/ua_cmds.c:115
+#: src/dird/ua_cmds.c:117
 msgid "label a tape"
 msgstr ""
 
-#: src/dird/ua_cmds.c:116
+#: src/dird/ua_cmds.c:118
 msgid "full or long list like list command"
 msgstr ""
 
-#: src/dird/ua_cmds.c:117
+#: src/dird/ua_cmds.c:119
+msgid "print current memory usage"
+msgstr ""
+
+#: src/dird/ua_cmds.c:120
 msgid "messages"
 msgstr ""
 
-#: src/dird/ua_cmds.c:118
+#: src/dird/ua_cmds.c:121
 msgid "mount <storage-name>"
 msgstr ""
 
-#: src/dird/ua_cmds.c:119
+#: src/dird/ua_cmds.c:122
 msgid "prune expired records from catalog"
 msgstr ""
 
-#: src/dird/ua_cmds.c:120
+#: src/dird/ua_cmds.c:123
 msgid "purge records from catalog"
 msgstr ""
 
-#: src/dird/ua_cmds.c:121
+#: src/dird/ua_cmds.c:124
 msgid "python control commands"
 msgstr ""
 
-#: src/dird/ua_cmds.c:122 src/console/console.c:163
+#: src/dird/ua_cmds.c:125 src/console/console.c:164
 msgid "quit"
 msgstr ""
 
-#: src/dird/ua_cmds.c:123
+#: src/dird/ua_cmds.c:126
 msgid "query catalog"
 msgstr ""
 
-#: src/dird/ua_cmds.c:124
+#: src/dird/ua_cmds.c:127
 msgid "restore files"
 msgstr ""
 
-#: src/dird/ua_cmds.c:125
+#: src/dird/ua_cmds.c:128
 msgid "relabel a tape"
 msgstr ""
 
-#: src/dird/ua_cmds.c:126
+#: src/dird/ua_cmds.c:129
 msgid "release <storage-name>"
 msgstr ""
 
-#: src/dird/ua_cmds.c:127
+#: src/dird/ua_cmds.c:130
 msgid "reload conf file"
 msgstr ""
 
-#: src/dird/ua_cmds.c:128
+#: src/dird/ua_cmds.c:131
 msgid "run <job-name>"
 msgstr ""
 
-#: src/dird/ua_cmds.c:129
+#: src/dird/ua_cmds.c:132
 msgid "status [storage | client]=<name>"
 msgstr ""
 
-#: src/dird/ua_cmds.c:130
+#: src/dird/ua_cmds.c:133
 msgid "sets debug level"
 msgstr ""
 
-#: src/dird/ua_cmds.c:131
+#: src/dird/ua_cmds.c:134
 msgid "sets new client address -- if authorized"
 msgstr ""
 
-#: src/dird/ua_cmds.c:132
+#: src/dird/ua_cmds.c:135
 msgid "show (resource records) [jobs | pools | ... | all]"
 msgstr ""
 
-#: src/dird/ua_cmds.c:133
+#: src/dird/ua_cmds.c:136
 msgid "use SQL to query catalog"
 msgstr ""
 
-#: src/dird/ua_cmds.c:134 src/console/console.c:166
+#: src/dird/ua_cmds.c:137 src/console/console.c:167
 msgid "print current time"
 msgstr ""
 
-#: src/dird/ua_cmds.c:135
+#: src/dird/ua_cmds.c:138
 msgid "turn on/off trace to file"
 msgstr ""
 
-#: src/dird/ua_cmds.c:136
+#: src/dird/ua_cmds.c:139
 msgid "unmount <storage-name>"
 msgstr ""
 
-#: src/dird/ua_cmds.c:137
+#: src/dird/ua_cmds.c:140
 msgid "umount <storage-name> for old-time Unix guys"
 msgstr ""
 
-#: src/dird/ua_cmds.c:138
+#: src/dird/ua_cmds.c:141
 msgid "update Volume, Pool or slots"
 msgstr ""
 
-#: src/dird/ua_cmds.c:139
+#: src/dird/ua_cmds.c:142
 msgid "use catalog xxx"
 msgstr ""
 
-#: src/dird/ua_cmds.c:140
+#: src/dird/ua_cmds.c:143
 msgid "does variable expansion"
 msgstr ""
 
-#: src/dird/ua_cmds.c:141
+#: src/dird/ua_cmds.c:144
 msgid "print Director version"
 msgstr ""
 
-#: src/dird/ua_cmds.c:142
+#: src/dird/ua_cmds.c:145
 msgid ""
 "wait until no jobs are running [<jobname=name> | <jobid=nnn> | "
 "<ujobid=complete_name>]"
 msgstr ""
 
-#: src/dird/ua_cmds.c:180
+#: src/dird/ua_cmds.c:186
 #, c-format
 msgid "%s: is an invalid command.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:219
+#: src/dird/ua_cmds.c:227
 msgid ""
 "You probably don't want to be using this command since it\n"
 "creates database records without labeling the Volumes.\n"
@@ -2720,252 +2774,282 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:238
+#: src/dird/ua_cmds.c:246
 #, c-format
 msgid "Pool already has maximum volumes=%d\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:240
+#: src/dird/ua_cmds.c:248
 msgid "Enter new maximum (zero for unlimited): "
 msgstr ""
 
-#: src/dird/ua_cmds.c:261
+#: src/dird/ua_cmds.c:269
 #, c-format
 msgid "Enter number of Volumes to create. 0=>fixed name. Max=%d: "
 msgstr ""
 
-#: src/dird/ua_cmds.c:267
+#: src/dird/ua_cmds.c:275
 #, c-format
 msgid "The number must be between 0 and %d\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:274
+#: src/dird/ua_cmds.c:282
 msgid "Enter Volume name: "
 msgstr ""
 
-#: src/dird/ua_cmds.c:278
+#: src/dird/ua_cmds.c:286
 msgid "Enter base volume name: "
 msgstr ""
 
-#: src/dird/ua_cmds.c:287 src/dird/ua_label.c:639
+#: src/dird/ua_cmds.c:295 src/dird/ua_label.c:645
 msgid "Volume name too long.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:291 src/dird/ua_label.c:645 src/lib/edit.c:459
+#: src/dird/ua_cmds.c:299 src/dird/ua_label.c:651 src/lib/edit.c:459
 msgid "Volume name must be at least one character long.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:300
+#: src/dird/ua_cmds.c:308
 msgid "Enter the starting number: "
 msgstr ""
 
-#: src/dird/ua_cmds.c:305
+#: src/dird/ua_cmds.c:313
 msgid "Start number must be greater than zero.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:316
+#: src/dird/ua_cmds.c:324
 msgid "Enter slot (0 for none): "
 msgstr ""
 
-#: src/dird/ua_cmds.c:320
+#: src/dird/ua_cmds.c:328
 msgid "InChanger? yes/no: "
 msgstr ""
 
-#: src/dird/ua_cmds.c:348
+#: src/dird/ua_cmds.c:356
 #, c-format
 msgid "%d Volumes created in pool %s\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:364 src/dird/ua_cmds.c:943
+#: src/dird/ua_cmds.c:372 src/dird/ua_cmds.c:1035
 msgid "Turn on or off? "
 msgstr ""
 
-#: src/dird/ua_cmds.c:399
+#: src/dird/ua_cmds.c:403
 #, c-format
 msgid "JobId %s is not running. Use Job name to cancel inactive jobs.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:408 src/dird/ua_cmds.c:418
+#: src/dird/ua_cmds.c:412 src/dird/ua_cmds.c:422
 #, c-format
 msgid "Warning Job %s is not running. Continuing anyway ...\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:441 src/filed/status.c:197 src/stored/status.c:421
+#: src/dird/ua_cmds.c:432 src/dird/ua_cmds.c:708 src/dird/ua_cmds.c:754
+msgid "Unauthorized command from this console.\n"
+msgstr ""
+
+#: src/dird/ua_cmds.c:457 src/filed/status.c:201 src/stored/status.c:447
 msgid "No Jobs running.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:444
+#: src/dird/ua_cmds.c:459
+msgid "None of your jobs are running.\n"
+msgstr ""
+
+#: src/dird/ua_cmds.c:464
 msgid "Select Job:\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:450
+#: src/dird/ua_cmds.c:473
 #, c-format
 msgid "JobId=%s Job=%s"
 msgstr ""
 
-#: src/dird/ua_cmds.c:455
+#: src/dird/ua_cmds.c:478
 msgid "Choose Job to cancel"
 msgstr ""
 
-#: src/dird/ua_cmds.c:459
+#: src/dird/ua_cmds.c:483
+#, c-format
+msgid ""
+"Cancel: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/dird/ua_cmds.c:484
+msgid "Confirm cancel?"
+msgstr ""
+
+#: src/dird/ua_cmds.c:490
 msgid "Confirm cancel (yes/no): "
 msgstr ""
 
-#: src/dird/ua_cmds.c:466
+#: src/dird/ua_cmds.c:498 src/dird/ua_cmds.c:749
 #, c-format
-msgid "Job %s not found.\n"
+msgid "Job \"%s\" not found.\n"
+msgstr ""
+
+#: src/dird/ua_cmds.c:595
+#, c-format
+msgid ""
+"Can't set %s RecyclePool to %s, %s is not in database.\n"
+"Try to update it with 'update pool=%s'\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:570
+#: src/dird/ua_cmds.c:662
 #, c-format
 msgid ""
 "Error: Pool %s already exists.\n"
 "Use update to change it.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:581
+#: src/dird/ua_cmds.c:673
 #, c-format
 msgid "Pool %s created.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:598
+#: src/dird/ua_cmds.c:690
 msgid "Python interpreter restarted.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:600 src/dird/ua_cmds.c:1171
+#: src/dird/ua_cmds.c:692 src/dird/ua_cmds.c:1275
 msgid "Nothing done.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:616 src/dird/ua_cmds.c:662
-msgid "Unauthorized command from this console.\n"
-msgstr ""
-
-#: src/dird/ua_cmds.c:623 src/dird/ua_run.c:398
+#: src/dird/ua_cmds.c:715 src/dird/ua_run.c:1224
 #, c-format
 msgid "Client \"%s\" not found.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:632
+#: src/dird/ua_cmds.c:724
 #, c-format
 msgid "Client \"%s\" address set to %s\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:657
-#, c-format
-msgid "Job \"%s\" not found.\n"
-msgstr ""
-
-#: src/dird/ua_cmds.c:666
+#: src/dird/ua_cmds.c:758
 #, c-format
 msgid "Job \"%s\" %sabled\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:693 src/dird/ua_status.c:297
+#: src/dird/ua_cmds.c:785 src/dird/ua_dotcmds.c:177 src/dird/ua_status.c:311
 #, c-format
 msgid "Connecting to Storage daemon %s at %s:%d\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:699 src/dird/ua_status.c:308
+#: src/dird/ua_cmds.c:791 src/dird/ua_dotcmds.c:183 src/dird/ua_status.c:322
 msgid "Connected to storage daemon\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:719 src/dird/ua_cmds.c:1058 src/dird/ua_status.c:335
+#: src/dird/ua_cmds.c:811 src/dird/ua_cmds.c:1162 src/dird/ua_dotcmds.c:203
+#: src/dird/ua_status.c:349
 #, c-format
 msgid "Connecting to Client %s at %s:%d\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:722 src/dird/ua_cmds.c:1061
+#: src/dird/ua_cmds.c:814 src/dird/ua_cmds.c:1165 src/dird/ua_dotcmds.c:206
 msgid "Failed to connect to Client.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:838
+#: src/dird/ua_cmds.c:930
 msgid "Enter new debug level: "
 msgstr ""
 
-#: src/dird/ua_cmds.c:904
+#: src/dird/ua_cmds.c:996 src/dird/ua_dotcmds.c:282
 msgid "Available daemons are: \n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:905
+#: src/dird/ua_cmds.c:997 src/dird/ua_dotcmds.c:283
 msgid "Director"
 msgstr ""
 
-#: src/dird/ua_cmds.c:906 src/dird/ua_run.c:575 src/dird/ua_select.c:168
-#: src/wx-console/wxbrestorepanel.cpp:338
-#: src/wx-console/wxbrestorepanel.cpp:354
-#: src/wx-console/wxbrestorepanel.cpp:478
+#: src/dird/ua_cmds.c:998 src/dird/ua_dotcmds.c:284 src/dird/ua_run.c:265
+#: src/dird/ua_select.c:168 src/wx-console/wxbrestorepanel.cpp:339
+#: src/wx-console/wxbrestorepanel.cpp:355
 #: src/wx-console/wxbrestorepanel.cpp:479
-#: src/wx-console/wxbrestorepanel.cpp:489
+#: src/wx-console/wxbrestorepanel.cpp:480
 #: src/wx-console/wxbrestorepanel.cpp:490
-#: src/wx-console/wxbrestorepanel.cpp:1153
-#: src/wx-console/wxbrestorepanel.cpp:1817
-#: src/wx-console/wxbrestorepanel.cpp:1888
+#: src/wx-console/wxbrestorepanel.cpp:491
+#: src/wx-console/wxbrestorepanel.cpp:1154
+#: src/wx-console/wxbrestorepanel.cpp:1818
+#: src/wx-console/wxbrestorepanel.cpp:1889
 msgid "Storage"
 msgstr ""
 
-#: src/dird/ua_cmds.c:907 src/dird/ua_run.c:578 src/dird/ua_select.c:298
-#: src/dird/ua_select.c:407 src/wx-console/wxbrestorepanel.cpp:335
-#: src/wx-console/wxbrestorepanel.cpp:353
-#: src/wx-console/wxbrestorepanel.cpp:430
+#: src/dird/ua_cmds.c:999 src/dird/ua_dotcmds.c:285 src/dird/ua_run.c:271
+#: src/dird/ua_select.c:311 src/dird/ua_select.c:420
+#: src/wx-console/wxbrestorepanel.cpp:336
+#: src/wx-console/wxbrestorepanel.cpp:354
 #: src/wx-console/wxbrestorepanel.cpp:431
-#: src/wx-console/wxbrestorepanel.cpp:441
+#: src/wx-console/wxbrestorepanel.cpp:432
 #: src/wx-console/wxbrestorepanel.cpp:442
-#: src/wx-console/wxbrestorepanel.cpp:689
-#: src/wx-console/wxbrestorepanel.cpp:1123
-#: src/wx-console/wxbrestorepanel.cpp:1210
-#: src/wx-console/wxbrestorepanel.cpp:1810
-#: src/wx-console/wxbrestorepanel.cpp:1812
-#: src/wx-console/wxbrestorepanel.cpp:1886
-#: src/wx-console/wxbrestorepanel.cpp:1941
+#: src/wx-console/wxbrestorepanel.cpp:443
+#: src/wx-console/wxbrestorepanel.cpp:690
+#: src/wx-console/wxbrestorepanel.cpp:1124
+#: src/wx-console/wxbrestorepanel.cpp:1211
+#: src/wx-console/wxbrestorepanel.cpp:1811
+#: src/wx-console/wxbrestorepanel.cpp:1813
+#: src/wx-console/wxbrestorepanel.cpp:1887
+#: src/wx-console/wxbrestorepanel.cpp:1943
 msgid "Client"
 msgstr ""
 
-#: src/dird/ua_cmds.c:908
+#: src/dird/ua_cmds.c:1000
 msgid "All"
 msgstr ""
 
-#: src/dird/ua_cmds.c:909
+#: src/dird/ua_cmds.c:1001
 msgid "Select daemon type to set debug level"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1013 src/dird/ua_run.c:541
+#: src/dird/ua_cmds.c:1091 src/dird/ua_cmds.c:1130 src/dird/ua_cmds.c:1798
+#, c-format
+msgid "No authorization for Job \"%s\"\n"
+msgstr ""
+
+#: src/dird/ua_cmds.c:1101
+#, c-format
+msgid "No authorization for FileSet \"%s\"\n"
+msgstr ""
+
+#: src/dird/ua_cmds.c:1113 src/dird/ua_run.c:217
 #, c-format
 msgid "Level %s not valid.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1026
+#: src/dird/ua_cmds.c:1126
 msgid "No job specified.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1066
+#: src/dird/ua_cmds.c:1170
 msgid "Error sending include list.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1071
+#: src/dird/ua_cmds.c:1175
 msgid "Error sending exclude list.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1157
+#: src/dird/ua_cmds.c:1261
 msgid ""
 "In general it is not a good idea to delete either a\n"
 "Pool or a Volume since they may contain data.\n"
 "\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1160
+#: src/dird/ua_cmds.c:1264
 msgid "Choose catalog item to delete"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1228
+#: src/dird/ua_cmds.c:1332
 msgid "Enter JobId to delete: "
 msgstr ""
 
-#: src/dird/ua_cmds.c:1265
+#: src/dird/ua_cmds.c:1367
 #, c-format
 msgid "Job %s and associated records deleted from the catalog.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1278
+#: src/dird/ua_cmds.c:1381
 #, c-format
 msgid ""
 "\n"
@@ -2973,74 +3057,104 @@ msgid ""
 "and all Jobs saved on that volume from the Catalog\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1282
-msgid "Are you sure you want to delete this Volume? (yes/no): "
+#: src/dird/ua_cmds.c:1385
+#, c-format
+msgid "Are you sure you want to delete Volume \"%s\"? (yes/no): "
 msgstr ""
 
-#: src/dird/ua_cmds.c:1303
-msgid "Are you sure you want to delete this Pool? (yes/no): "
+#: src/dird/ua_cmds.c:1409
+#, c-format
+msgid "Are you sure you want to delete Pool \"%s\"? (yes/no): "
 msgstr ""
 
-#: src/dird/ua_cmds.c:1409
+#: src/dird/ua_cmds.c:1523
 #, c-format
 msgid "Using Catalog name=%s DB=%s\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1469
+#: src/dird/ua_cmds.c:1583
 msgid "ERR: Can't open db\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1505
+#: src/dird/ua_cmds.c:1619
 msgid "ERR: Job was not found\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1581 src/dird/ua_tree.c:643 src/stored/btape.c:2585
+#: src/dird/ua_cmds.c:1695 src/dird/ua_tree.c:664 src/stored/btape.c:2587
 #, c-format
 msgid ""
 "  Command    Description\n"
 "  =======    ===========\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1583
+#: src/dird/ua_cmds.c:1697
 #, c-format
 msgid "  %-10s %s\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1585
+#: src/dird/ua_cmds.c:1699
 msgid ""
 "\n"
 "When at a prompt, entering a period cancels the command.\n"
 "\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1601
+#: src/dird/ua_cmds.c:1716 src/dird/ua_status.c:263 src/stored/status.c:79
 #, c-format
-msgid "%s Version: %s (%s)\n"
+msgid "%s Version: %s (%s) %s %s %s\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1617
-msgid "Could not find a Catalog resource\n"
+#: src/dird/ua_cmds.c:1759 src/dird/ua_cmds.c:1786 src/dird/ua_cmds.c:1808
+#, c-format
+msgid "No authorization for Catalog \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1630
+#: src/dird/ua_cmds.c:1776
 #, c-format
-msgid "Could not open catalog database \"%s\".\n"
+msgid "No authorization for Client \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:118 src/console/console.c:203
-msgid ": is an invalid command\n"
+#: src/dird/ua_cmds.c:1831 src/dird/ua_select.c:221
+msgid "Could not find a Catalog resource\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:141
-msgid "The Director will segment fault.\n"
-msgstr ""
+#: src/dird/ua_cmds.c:1844
+#, c-format
+msgid "Could not open catalog database \"%s\".\n"
+msgstr ""
+
+#: src/dird/ua_cmds.c:1854
+#, c-format
+msgid "Using Catalog \"%s\"\n"
+msgstr ""
+
+#: src/dird/ua_dotcmds.c:138
+msgid ": is an invalid command.\n"
+msgstr ""
+
+#: src/dird/ua_dotcmds.c:238 src/dird/ua_dotcmds.c:288
+msgid "The Director will segment fault.\n"
+msgstr ""
+
+#: src/dird/ua_dotcmds.c:286
+msgid "Select daemon type to make die"
+msgstr ""
+
+#: src/dird/ua_dotcmds.c:453
+msgid "Access to specified Client or FileSet not allowed.\n"
+msgstr ""
 
-#: src/dird/ua_dotcmds.c:255 src/dird/ua_restore.c:758
-#: src/dird/ua_restore.c:786 src/dird/ua_restore.c:807
+#: src/dird/ua_dotcmds.c:458 src/dird/ua_dotcmds.c:494
+#: src/dird/ua_restore.c:882 src/dird/ua_restore.c:911
+#: src/dird/ua_restore.c:932
 #, c-format
 msgid "Query failed: %s. ERR=%s\n"
 msgstr ""
 
+#: src/dird/ua_dotcmds.c:489
+msgid "query keyword not found.\n"
+msgstr ""
+
 #: src/dird/ua_input.c:95
 msgid "Enter slot"
 msgstr ""
@@ -3050,22 +3164,22 @@ msgstr ""
 msgid "Expected a positive integer, got: %s\n"
 msgstr ""
 
-#: src/dird/ua_input.c:123 src/dird/ua_run.c:743 src/dird/ua_update.c:240
-#: src/dird/ua_update.c:260 src/dird/ua_update.c:571
-#: src/stored/parse_bsr.c:779 src/tools/dbcheck.c:1153
+#: src/dird/ua_input.c:123 src/dird/ua_run.c:446 src/dird/ua_update.c:245
+#: src/dird/ua_update.c:265 src/dird/ua_update.c:609
+#: src/stored/parse_bsr.c:779 src/tools/dbcheck.c:1202
 msgid "yes"
 msgstr ""
 
-#: src/dird/ua_input.c:127 src/dird/ua_update.c:240 src/dird/ua_update.c:260
-#: src/dird/ua_update.c:571 src/stored/parse_bsr.c:779
+#: src/dird/ua_input.c:127 src/dird/ua_update.c:245 src/dird/ua_update.c:265
+#: src/dird/ua_update.c:609 src/stored/parse_bsr.c:779
 msgid "no"
 msgstr ""
 
-#: src/dird/ua_input.c:161
+#: src/dird/ua_input.c:162
 msgid "Invalid response. You must answer yes or no.\n"
 msgstr ""
 
-#: src/dird/ua_input.c:184
+#: src/dird/ua_input.c:185
 msgid "Invalid Enabled value, it must be yes, no, archived, 0, 1, or 2\n"
 msgstr ""
 
@@ -3097,15 +3211,15 @@ msgstr ""
 msgid "Slot too large.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:184 src/dird/ua_label.c:349 src/dird/ua_run.c:373
+#: src/dird/ua_label.c:184 src/dird/ua_label.c:349 src/dird/ua_run.c:1199
 msgid "command line"
 msgstr ""
 
-#: src/dird/ua_label.c:202 src/dird/ua_label.c:507
+#: src/dird/ua_label.c:202 src/dird/ua_label.c:513
 msgid "No slots in changer to scan.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:214 src/dird/ua_label.c:518
+#: src/dird/ua_label.c:214 src/dird/ua_label.c:524
 msgid "No Volumes found to label, or no barcodes.\n"
 msgstr ""
 
@@ -3150,115 +3264,115 @@ msgstr ""
 msgid "Media record for new Volume \"%s\" already exists.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:422
+#: src/dird/ua_label.c:425
 msgid "Enter slot (0 or Enter for none): "
 msgstr ""
 
-#: src/dird/ua_label.c:447
+#: src/dird/ua_label.c:453
 #, c-format
 msgid "Delete of Volume \"%s\" failed. ERR=%s"
 msgstr ""
 
-#: src/dird/ua_label.c:450
+#: src/dird/ua_label.c:456
 #, c-format
 msgid "Old volume \"%s\" deleted from catalog.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:461
+#: src/dird/ua_label.c:467
 #, c-format
 msgid "Requesting to mount %s ...\n"
 msgstr ""
 
-#: src/dird/ua_label.c:483
+#: src/dird/ua_label.c:489
 msgid "Do not forget to mount the drive!!!\n"
 msgstr ""
 
-#: src/dird/ua_label.c:523
+#: src/dird/ua_label.c:529
 msgid ""
 "The following Volumes will be labeled:\n"
 "Slot  Volume\n"
 "==============\n"
 msgstr ""
 
-#: src/dird/ua_label.c:532
-msgid "Do you want to continue? (yes|no): "
+#: src/dird/ua_label.c:538
+msgid "Do you want to label these Volumes? (yes|no): "
 msgstr ""
 
-#: src/dird/ua_label.c:553
+#: src/dird/ua_label.c:559
 #, c-format
 msgid "Media record for Slot %d Volume \"%s\" already exists.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:559
+#: src/dird/ua_label.c:565
 #, c-format
 msgid "Error setting InChanger: ERR=%s"
 msgstr ""
 
-#: src/dird/ua_label.c:582
+#: src/dird/ua_label.c:588
 #, c-format
 msgid "Maximum pool Volumes=%d reached.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:589
+#: src/dird/ua_label.c:595
 #, c-format
 msgid "Catalog record for cleaning tape \"%s\" successfully created.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:596
+#: src/dird/ua_label.c:602
 #, c-format
 msgid "Catalog error on cleaning tape: %s"
 msgstr ""
 
-#: src/dird/ua_label.c:632
+#: src/dird/ua_label.c:638
 #, c-format
 msgid "Illegal character \"%c\" in a volume name.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:679
+#: src/dird/ua_label.c:685
 #, c-format
 msgid "Sending relabel command from \"%s\" to \"%s\" ...\n"
 msgstr ""
 
-#: src/dird/ua_label.c:686
+#: src/dird/ua_label.c:692
 #, c-format
 msgid "Sending label command for Volume \"%s\" Slot %d ...\n"
 msgstr ""
 
-#: src/dird/ua_label.c:727
+#: src/dird/ua_label.c:733
 #, c-format
 msgid "Catalog record for Volume \"%s\", Slot %d  successfully created.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:740
+#: src/dird/ua_label.c:746
 #, c-format
 msgid "Label command failed for Volume %s.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:750
+#: src/dird/ua_label.c:756
 #, c-format
 msgid "Connecting to Storage daemon %s at %s:%d ...\n"
 msgstr ""
 
-#: src/dird/ua_label.c:778
+#: src/dird/ua_label.c:784
 msgid "Could not open SD socket.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:850 src/dird/ua_label.c:860
+#: src/dird/ua_label.c:856 src/dird/ua_label.c:866
 #, c-format
 msgid "Invalid Slot number: %s\n"
 msgstr ""
 
-#: src/dird/ua_label.c:869
+#: src/dird/ua_label.c:875
 #, c-format
 msgid "Invalid Volume name: %s\n"
 msgstr ""
 
-#: src/dird/ua_label.c:948
+#: src/dird/ua_label.c:954
 #, c-format
 msgid "Device \"%s\" has %d slots.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:997
+#: src/dird/ua_label.c:1003
 #, c-format
 msgid "Pool \"%s\" resource not found for volume \"%s\"!\n"
 msgstr ""
@@ -3294,7 +3408,7 @@ msgstr ""
 msgid "No Pool specified.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:405 src/dird/ua_select.c:474
+#: src/dird/ua_output.c:405 src/dird/ua_select.c:488
 #, c-format
 msgid "Error obtaining pool ids. ERR=%s\n"
 msgstr ""
@@ -3304,7 +3418,7 @@ msgstr ""
 msgid "Pool: %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:431 src/dird/ua_status.c:465
+#: src/dird/ua_output.c:431 src/dird/ua_status.c:481
 msgid "Ignoring invalid value for days. Max is 50.\n"
 msgstr ""
 
@@ -3313,77 +3427,68 @@ msgstr ""
 msgid "Unknown list keyword: %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:467
+#: src/dird/ua_output.c:466
 #, c-format
 msgid "%s is not a job name.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:487
+#: src/dird/ua_output.c:477
+#, c-format
+msgid "Could not Pool Job %s\n"
+msgstr ""
+
+#: src/dird/ua_output.c:489
 #, c-format
-msgid "Could not find next Volume for Job %s (%s, %s).\n"
+msgid "Could not find next Volume for Job %s (Pool=%s, Level=%s).\n"
 msgstr ""
 
-#: src/dird/ua_output.c:491
+#: src/dird/ua_output.c:493
 #, c-format
-msgid "The next Volume to be used by Job \"%s\" (%s, %s) will be %s\n"
+msgid ""
+"The next Volume to be used by Job \"%s\" (Pool=%s, Level=%s) will be %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:501
+#: src/dird/ua_output.c:503
 #, c-format
 msgid "Could not find next Volume for Job %s.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:691
+#: src/dird/ua_output.c:702
 msgid "You have no messages.\n"
 msgstr ""
 
-#: src/dird/ua_prune.c:167
+#: src/dird/ua_prune.c:132
 msgid "Choose item to prune"
 msgstr ""
 
-#: src/dird/ua_prune.c:191
+#: src/dird/ua_prune.c:156
 #, c-format
 msgid "Cannot prune Volume \"%s\" because it is archived.\n"
 msgstr ""
 
-#: src/dird/ua_prune.c:252
+#: src/dird/ua_prune.c:218
 msgid "No Files found to prune.\n"
 msgstr ""
 
-#: src/dird/ua_prune.c:273
+#: src/dird/ua_prune.c:240
 #, c-format
 msgid "Pruned Files from %s Jobs for client %s from catalog.\n"
 msgstr ""
 
-#: src/dird/ua_prune.c:379
-msgid "No Jobs found to prune.\n"
-msgstr ""
-
-#: src/dird/ua_prune.c:426
+#: src/dird/ua_prune.c:364
 #, c-format
 msgid "Pruned %d %s for client %s from catalog.\n"
 msgstr ""
 
-#: src/dird/ua_prune.c:427
+#: src/dird/ua_prune.c:365
 msgid "Jobs"
 msgstr ""
 
-#: src/dird/ua_prune.c:479
-#, c-format
-msgid "There are no Jobs associated with Volume \"%s\". Prune not needed.\n"
-msgstr ""
-
-#: src/dird/ua_prune.c:486 src/dird/ua_purge.c:518
-#, c-format
-msgid "There are no Jobs associated with Volume \"%s\". Marking it purged.\n"
-msgstr ""
-
-#: src/dird/ua_prune.c:537
-#, c-format
-msgid "Pruned %d %s on Volume \"%s\" from catalog.\n"
+#: src/dird/ua_prune.c:367
+msgid "No Jobs found to prune.\n"
 msgstr ""
 
-#: src/dird/ua_purge.c:190
+#: src/dird/ua_purge.c:90
 msgid ""
 "\n"
 "This command is can be DANGEROUS!!!\n"
@@ -3395,70 +3500,71 @@ msgid ""
 "PRUNE command, which respects retention periods.\n"
 msgstr ""
 
-#: src/dird/ua_purge.c:250
+#: src/dird/ua_purge.c:152
 msgid "Choose item to purge"
 msgstr ""
 
-#: src/dird/ua_purge.c:295
+#: src/dird/ua_purge.c:199
 #, c-format
 msgid "Begin purging files for Client \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_purge.c:307
+#: src/dird/ua_purge.c:208 src/dird/ua_purge.c:258
 #, c-format
 msgid "No Files found for client %s to purge from %s catalog.\n"
 msgstr ""
 
-#: src/dird/ua_purge.c:326
+#: src/dird/ua_purge.c:211
 #, c-format
-msgid "%d Files for client \"%s\" purged from %s catalog.\n"
+msgid "Files for %d Jobs for client \"%s\" purged from %s catalog.\n"
 msgstr ""
 
-#: src/dird/ua_purge.c:362
+#: src/dird/ua_purge.c:249
 #, c-format
 msgid "Begin purging jobs from Client \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_purge.c:373
-#, c-format
-msgid "No Jobs found for client %s to purge from %s catalog.\n"
-msgstr ""
-
-#: src/dird/ua_purge.c:403
+#: src/dird/ua_purge.c:261
 #, c-format
 msgid "%d Jobs for client %s purged from %s catalog.\n"
 msgstr ""
 
-#: src/dird/ua_purge.c:500
+#: src/dird/ua_purge.c:407
 #, c-format
 msgid ""
+"\n"
 "Volume \"%s\" has VolStatus \"%s\" and cannot be purged.\n"
 "The VolStatus must be: Append, Full, Used, or Error to be purged.\n"
 msgstr ""
 
-#: src/dird/ua_purge.c:564
+#: src/dird/ua_purge.c:440
 #, c-format
 msgid "%d File%s on Volume \"%s\" purged from catalog.\n"
 msgstr ""
 
-#: src/dird/ua_purge.c:578
+#: src/dird/ua_purge.c:481
 #, c-format
 msgid ""
 "There are no more Jobs associated with Volume \"%s\". Marking it purged.\n"
 msgstr ""
 
-#: src/dird/ua_purge.c:610
+#: src/dird/ua_purge.c:522
+#, c-format
+msgid "Unable move recycled Volume in full Pool \"%s\" MaxVols=%d\n"
+msgstr ""
+
+#: src/dird/ua_purge.c:535
 #, c-format
 msgid "All records pruned from Volume \"%s\"; marking it \"Purged\"\n"
 msgstr ""
 
-#: src/dird/ua_purge.c:615
+#: src/dird/ua_purge.c:540
 #, c-format
 msgid "Cannot purge Volume with VolStatus=%s\n"
 msgstr ""
 
-#: src/dird/ua_query.c:72 src/findlib/create_file.c:267
-#: src/findlib/create_file.c:326
+#: src/dird/ua_query.c:72 src/findlib/create_file.c:283
+#: src/findlib/create_file.c:383
 #, c-format
 msgid "Could not open %s: ERR=%s\n"
 msgstr ""
@@ -3484,55 +3590,59 @@ msgstr ""
 msgid "Warning prompt %d missing.\n"
 msgstr ""
 
-#: src/dird/ua_query.c:265
+#: src/dird/ua_query.c:264
 msgid ""
 "Entering SQL query mode.\n"
 "Terminate each query with a semicolon.\n"
 "Terminate query mode with a blank line.\n"
 msgstr ""
 
-#: src/dird/ua_query.c:268 src/dird/ua_query.c:285
+#: src/dird/ua_query.c:267 src/dird/ua_query.c:283
 msgid "Enter SQL query: "
 msgstr ""
 
-#: src/dird/ua_query.c:287
+#: src/dird/ua_query.c:285
 msgid "Add to SQL query: "
 msgstr ""
 
-#: src/dird/ua_query.c:291
+#: src/dird/ua_query.c:288
 msgid "End query mode.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:98 src/dird/ua_restore.c:192 src/dird/ua_run.c:206
-msgid "Forbidden \"where\" specified.\n"
+#: src/dird/ua_restore.c:133
+msgid "\"RegexWhere\" specification not authorized.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:120
+#: src/dird/ua_restore.c:140
+msgid "\"where\" specification not authorized.\n"
+msgstr ""
+
+#: src/dird/ua_restore.c:162
 msgid ""
 "No Restore Job Resource found in bacula-dir.conf.\n"
 "You must create at least one before running this command.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:136
+#: src/dird/ua_restore.c:178
 msgid "Restore not done.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:148
+#: src/dird/ua_restore.c:190
 msgid "Unable to construct a valid BSR. Cannot continue.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:152 src/dird/ua_restore.c:167
+#: src/dird/ua_restore.c:194 src/dird/ua_restore.c:209
 msgid "No files selected to be restored.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:160
+#: src/dird/ua_restore.c:202
 msgid ""
 "\n"
 "1 file selected to be restored.\n"
 "\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:163
+#: src/dird/ua_restore.c:205
 #, c-format
 msgid ""
 "\n"
@@ -3540,85 +3650,85 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:182
-msgid "No Restore Job resource found!\n"
+#: src/dird/ua_restore.c:224
+msgid "No Client resource found!\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:269
+#: src/dird/ua_restore.c:329
 #, c-format
 msgid "Missing value for keyword: %s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:318
+#: src/dird/ua_restore.c:407
 msgid "List last 20 Jobs run"
 msgstr ""
 
-#: src/dird/ua_restore.c:319
+#: src/dird/ua_restore.c:408
 msgid "List Jobs where a given File is saved"
 msgstr ""
 
-#: src/dird/ua_restore.c:320
+#: src/dird/ua_restore.c:409
 msgid "Enter list of comma separated JobIds to select"
 msgstr ""
 
-#: src/dird/ua_restore.c:321
+#: src/dird/ua_restore.c:410
 msgid "Enter SQL list command"
 msgstr ""
 
-#: src/dird/ua_restore.c:322
+#: src/dird/ua_restore.c:411
 msgid "Select the most recent backup for a client"
 msgstr ""
 
-#: src/dird/ua_restore.c:323
+#: src/dird/ua_restore.c:412
 msgid "Select backup for a client before a specified time"
 msgstr ""
 
-#: src/dird/ua_restore.c:324
+#: src/dird/ua_restore.c:413
 msgid "Enter a list of files to restore"
 msgstr ""
 
-#: src/dird/ua_restore.c:325
+#: src/dird/ua_restore.c:414
 msgid "Enter a list of files to restore before a specified time"
 msgstr ""
 
-#: src/dird/ua_restore.c:326
+#: src/dird/ua_restore.c:415
 msgid "Find the JobIds of the most recent backup for a client"
 msgstr ""
 
-#: src/dird/ua_restore.c:327
+#: src/dird/ua_restore.c:416
 msgid "Find the JobIds for a backup for a client before a specified time"
 msgstr ""
 
-#: src/dird/ua_restore.c:328
+#: src/dird/ua_restore.c:417
 msgid "Enter a list of directories to restore for found JobIds"
 msgstr ""
 
-#: src/dird/ua_restore.c:329 src/dird/ua_status.c:733 src/filed/status.c:254
-#: src/stored/status.c:495 src/wx-console/wxbconfigpanel.cpp:212
+#: src/dird/ua_restore.c:418 src/dird/ua_status.c:760 src/filed/status.c:256
+#: src/stored/status.c:521 src/wx-console/wxbconfigpanel.cpp:212
 msgid "Cancel"
 msgstr ""
 
-#: src/dird/ua_restore.c:365
+#: src/dird/ua_restore.c:459
 #, c-format
 msgid "Unknown keyword: %s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:389
+#: src/dird/ua_restore.c:488 src/dird/ua_update.c:833
 #, c-format
 msgid "Improper date format: %s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:424 src/dird/ua_select.c:606
+#: src/dird/ua_restore.c:523 src/dird/ua_select.c:620
 #, c-format
 msgid "Error: Pool resource \"%s\" does not exist.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:429
+#: src/dird/ua_restore.c:528
 #, c-format
 msgid "Error: Pool resource \"%s\" access not allowed.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:445
+#: src/dird/ua_restore.c:544
 msgid ""
 "\n"
 "First you select one or more JobIds that contain files\n"
@@ -3628,230 +3738,230 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:457
+#: src/dird/ua_restore.c:556
 msgid "To select the JobIds, you have the following choices:\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:462
+#: src/dird/ua_restore.c:561
 msgid "Select item: "
 msgstr ""
 
-#: src/dird/ua_restore.c:467 src/dird/ua_restore.c:502
+#: src/dird/ua_restore.c:566 src/dird/ua_restore.c:601
 msgid "SQL query not authorized.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:480
+#: src/dird/ua_restore.c:579
 msgid "Enter Filename (no path):"
 msgstr ""
 
-#: src/dird/ua_restore.c:495 src/dird/ua_restore.c:591
+#: src/dird/ua_restore.c:594 src/dird/ua_restore.c:702
 msgid "Enter JobId(s), comma separated, to restore: "
 msgstr ""
 
-#: src/dird/ua_restore.c:505
+#: src/dird/ua_restore.c:604
 msgid "Enter SQL list command: "
 msgstr ""
 
-#: src/dird/ua_restore.c:533 src/dird/ua_restore.c:554
+#: src/dird/ua_restore.c:638 src/dird/ua_restore.c:661
 msgid ""
 "Enter file names with paths, or < to enter a filename\n"
 "containing a list of file names with paths, and terminate\n"
 "them with a blank line.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:537 src/dird/ua_restore.c:558
+#: src/dird/ua_restore.c:642 src/dird/ua_restore.c:665
 msgid "Enter full filename: "
 msgstr ""
 
-#: src/dird/ua_restore.c:589
+#: src/dird/ua_restore.c:700
 #, c-format
-msgid "You have already seleted the following JobIds: %s\n"
+msgid "You have already selected the following JobIds: %s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:604
+#: src/dird/ua_restore.c:717
 msgid ""
 "Enter full directory names or start the name\n"
 "with a < to indicate it is a filename containing a list\n"
 "of directories and terminate them with a blank line.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:608
+#: src/dird/ua_restore.c:721
 msgid "Enter directory name: "
 msgstr ""
 
-#: src/dird/ua_restore.c:629
-msgid "No Jobs selected.\n"
+#: src/dird/ua_restore.c:752
+msgid "Invalid JobId in list.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:633
+#: src/dird/ua_restore.c:765
 #, c-format
-msgid "You have selected the following JobIds: %s\n"
+msgid "Unable to get Job record for JobId=%s: ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:636
+#: src/dird/ua_restore.c:771
 #, c-format
-msgid "You have selected the following JobId: %s\n"
+msgid "Access to JobId=%s (Job \"%s\") not authorized. Not selected.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:644
-msgid "Invalid JobId in list.\n"
+#: src/dird/ua_restore.c:784
+msgid "No Jobs selected.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:657
+#: src/dird/ua_restore.c:788
 #, c-format
-msgid "Unable to get Job record for JobId=%s: ERR=%s\n"
+msgid "You have selected the following JobIds: %s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:662
+#: src/dird/ua_restore.c:790
 #, c-format
-msgid "No authorization. Job \"%s\" not selected.\n"
+msgid "You have selected the following JobId: %s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:676
+#: src/dird/ua_restore.c:800
 msgid ""
 "The restored files will the most current backup\n"
 "BEFORE the date you specify below.\n"
 "\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:679
+#: src/dird/ua_restore.c:803
 msgid "Enter date as YYYY-MM-DD HH:MM:SS :"
 msgstr ""
 
-#: src/dird/ua_restore.c:685
+#: src/dird/ua_restore.c:809
 msgid "Improper date format.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:706
+#: src/dird/ua_restore.c:830
 #, c-format
 msgid "Cannot open file %s: ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:714 src/dird/ua_restore.c:718
+#: src/dird/ua_restore.c:838 src/dird/ua_restore.c:842
 #, c-format
-msgid "Error occurred on line %d of %s\n"
+msgid "Error occurred on line %d of file \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:762 src/dird/ua_restore.c:790
+#: src/dird/ua_restore.c:886 src/dird/ua_restore.c:915
 #, c-format
 msgid "No database record found for: %s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:777
+#: src/dird/ua_restore.c:902
 msgid "No JobId specified cannot continue.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:811
+#: src/dird/ua_restore.c:936
 #, c-format
 msgid "No table found: %s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:908
+#: src/dird/ua_restore.c:1033
 #, c-format
 msgid ""
 "\n"
 "Building directory tree for JobId %s ...  "
 msgstr ""
 
-#: src/dird/ua_restore.c:920
+#: src/dird/ua_restore.c:1045
 msgid ""
 "\n"
 "There were no files inserted into the tree, so file selection\n"
 "is not possible.Most likely your retention policy pruned the files\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:922
+#: src/dird/ua_restore.c:1047
 msgid ""
 "\n"
 "Do you want to restore all the files? (yes|no): "
 msgstr ""
 
-#: src/dird/ua_restore.c:938
+#: src/dird/ua_restore.c:1063
 #, c-format
 msgid ""
 "\n"
 "1 Job, %s files inserted into the tree and marked for extraction.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:942
+#: src/dird/ua_restore.c:1067
 #, c-format
 msgid ""
 "\n"
 "1 Job, %s files inserted into the tree.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:948
+#: src/dird/ua_restore.c:1073
 #, c-format
 msgid ""
 "\n"
 "%d Jobs, %s files inserted into the tree and marked for extraction.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:952
+#: src/dird/ua_restore.c:1077
 #, c-format
 msgid ""
 "\n"
 "%d Jobs, %s files inserted into the tree.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:1026
+#: src/dird/ua_restore.c:1150
 #, c-format
 msgid "Error getting FileSet \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:1034 src/dird/ua_select.c:183
+#: src/dird/ua_restore.c:1158 src/dird/ua_select.c:183
 msgid "The defined FileSet resources are:\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:1038 src/dird/ua_run.c:577 src/dird/ua_select.c:191
+#: src/dird/ua_restore.c:1162 src/dird/ua_run.c:267 src/dird/ua_select.c:191
 msgid "FileSet"
 msgstr ""
 
-#: src/dird/ua_restore.c:1038 src/dird/ua_select.c:191
+#: src/dird/ua_restore.c:1162 src/dird/ua_select.c:191
 msgid "Select FileSet resource"
 msgstr ""
 
-#: src/dird/ua_restore.c:1040
+#: src/dird/ua_restore.c:1164
 #, c-format
 msgid "No FileSet found for client \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:1046
+#: src/dird/ua_restore.c:1170
 #, c-format
 msgid "Error getting FileSet record: %s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:1047
+#: src/dird/ua_restore.c:1171
 msgid ""
 "This probably means you modified the FileSet.\n"
 "Continuing anyway.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:1062
+#: src/dird/ua_restore.c:1186
 #, c-format
 msgid "Pool \"%s\" not found, using any pool.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:1088 src/dird/ua_restore.c:1104
+#: src/dird/ua_restore.c:1213 src/dird/ua_restore.c:1229
 #, c-format
 msgid "No Full backup before %s found.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:1127
+#: src/dird/ua_restore.c:1252
 msgid "No jobs found.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:1284
+#: src/dird/ua_restore.c:1411
 #, c-format
 msgid "Warning default storage overridden by \"%s\" on command line.\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:1300
+#: src/dird/ua_restore.c:1427
 #, c-format
 msgid "Storage \"%s\" not found, using Storage \"%s\" from MediaType \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:1308
+#: src/dird/ua_restore.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -3859,334 +3969,283 @@ msgid ""
 "MediaType \"%s\", needed by the Jobs you selected.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:136
-#, c-format
-msgid "Value missing for keyword %s\n"
-msgstr ""
-
-#: src/dird/ua_run.c:143
-msgid "Job name specified twice.\n"
+#: src/dird/ua_run.c:152 src/dird/ua_run.c:338
+msgid "Invalid time, using current time.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:151
-msgid "JobId specified twice.\n"
+#: src/dird/ua_run.c:174
+#, c-format
+msgid "Invalid replace option: %s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:160
-msgid "Client specified twice.\n"
+#: src/dird/ua_run.c:242
+msgid "OK to run? (yes/mod/no): "
 msgstr ""
 
-#: src/dird/ua_run.c:168
-msgid "FileSet specified twice.\n"
+#: src/dird/ua_run.c:260 src/dird/ua_select.c:63
+msgid "mod"
 msgstr ""
 
-#: src/dird/ua_run.c:176
-msgid "Level specified twice.\n"
+#: src/dird/ua_run.c:263 src/dird/ua_update.c:518
+msgid "Parameters to modify:\n"
 msgstr ""
 
-#: src/dird/ua_run.c:185
-msgid "Storage specified twice.\n"
+#: src/dird/ua_run.c:264
+msgid "Level"
 msgstr ""
 
-#: src/dird/ua_run.c:193
-msgid "Pool specified twice.\n"
+#: src/dird/ua_run.c:269
+msgid "Restore Client"
 msgstr ""
 
-#: src/dird/ua_run.c:201
-msgid "Where specified twice.\n"
+#: src/dird/ua_run.c:273 src/wx-console/wxbrestorepanel.cpp:356
+#: src/wx-console/wxbrestorepanel.cpp:844
+#: src/wx-console/wxbrestorepanel.cpp:1891
+msgid "When"
 msgstr ""
 
-#: src/dird/ua_run.c:213
-msgid "Bootstrap specified twice.\n"
+#: src/dird/ua_run.c:274 src/wx-console/wxbrestorepanel.cpp:357
+#: src/wx-console/wxbrestorepanel.cpp:1117
+#: src/wx-console/wxbrestorepanel.cpp:1894
+msgid "Priority"
 msgstr ""
 
-#: src/dird/ua_run.c:221
-msgid "Replace specified twice.\n"
+#: src/dird/ua_run.c:278 src/dird/ua_select.c:506 src/dird/ua_select.c:596
+#: src/dird/ua_update.c:529 src/wx-console/wxbrestorepanel.cpp:338
+#: src/wx-console/wxbrestorepanel.cpp:527
+#: src/wx-console/wxbrestorepanel.cpp:537
+#: src/wx-console/wxbrestorepanel.cpp:1807
+msgid "Pool"
 msgstr ""
 
-#: src/dird/ua_run.c:229
-msgid "When specified twice.\n"
+#: src/dird/ua_run.c:280
+msgid "Verify Job"
 msgstr ""
 
-#: src/dird/ua_run.c:237
-msgid "Priority specified twice.\n"
+#: src/dird/ua_run.c:283 src/wx-console/wxbrestorepanel.cpp:349
+#: src/wx-console/wxbrestorepanel.cpp:1872
+msgid "Bootstrap"
 msgstr ""
 
-#: src/dird/ua_run.c:242
-msgid "Priority must be positive nonzero setting it to 10.\n"
+#: src/dird/ua_run.c:284 src/wx-console/wxbrestorepanel.cpp:350
+#: src/wx-console/wxbrestorepanel.cpp:1093
+#: src/wx-console/wxbrestorepanel.cpp:1874
+msgid "Where"
 msgstr ""
 
-#: src/dird/ua_run.c:252
-msgid "Verify Job specified twice.\n"
+#: src/dird/ua_run.c:285
+msgid "File Relocation"
 msgstr ""
 
-#: src/dird/ua_run.c:284
-msgid "Migration Job specified twice.\n"
+#: src/dird/ua_run.c:286 src/wx-console/wxbrestorepanel.cpp:352
+#: src/wx-console/wxbrestorepanel.cpp:1101
+#: src/wx-console/wxbrestorepanel.cpp:1878
+#: src/wx-console/wxbrestorepanel.cpp:1879
+#: src/wx-console/wxbrestorepanel.cpp:1880
+#: src/wx-console/wxbrestorepanel.cpp:1881
+#: src/wx-console/wxbrestorepanel.cpp:1882
+msgid "Replace"
 msgstr ""
 
-#: src/dird/ua_run.c:310
-#, c-format
-msgid "Invalid keyword: %s\n"
+#: src/dird/ua_run.c:287
+msgid "JobId"
 msgstr ""
 
-#: src/dird/ua_run.c:322
-#, c-format
-msgid "Catalog \"%s\" not found\n"
+#: src/dird/ua_run.c:289 src/dird/ua_run.c:487 src/dird/ua_update.c:535
+msgid "Select parameter to modify"
 msgstr ""
 
-#: src/dird/ua_run.c:333
-#, c-format
-msgid "Job \"%s\" not found\n"
+#: src/dird/ua_run.c:298 src/dird/ua_run.c:1205
+msgid "user selection"
 msgstr ""
 
-#: src/dird/ua_run.c:340
-msgid "A job name must be specified.\n"
+#: src/dird/ua_run.c:330
+msgid ""
+"Please enter desired start time as YYYY-MM-DD HH:MM:SS (return for now): "
 msgstr ""
 
-#: src/dird/ua_run.c:346
-#, c-format
-msgid "No authorization. Job \"%s\".\n"
+#: src/dird/ua_run.c:345
+msgid "Enter new Priority: "
 msgstr ""
 
-#: src/dird/ua_run.c:355
-#, c-format
-msgid "Pool \"%s\" not found.\n"
+#: src/dird/ua_run.c:349
+msgid "Priority must be a positive integer.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:365
-#, c-format
-msgid "No authorization. Pool \"%s\".\n"
+#: src/dird/ua_run.c:369
+msgid "Please enter the Bootstrap file name: "
 msgstr ""
 
-#: src/dird/ua_run.c:376
+#: src/dird/ua_run.c:380
 #, c-format
-msgid "Storage \"%s\" not found.\n"
-msgstr ""
-
-#: src/dird/ua_run.c:379 src/dird/ua_run.c:603
-msgid "user selection"
+msgid "Warning cannot open %s: ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:388
-#, c-format
-msgid "No authorization. Storage \"%s\".\n"
+#: src/dird/ua_run.c:399
+msgid "Please enter path prefix for restore (/ for none): "
 msgstr ""
 
-#: src/dird/ua_run.c:408
-#, c-format
-msgid "No authorization. Client \"%s\".\n"
+#: src/dird/ua_run.c:421
+msgid "Replace:\n"
 msgstr ""
 
-#: src/dird/ua_run.c:417
-#, c-format
-msgid "FileSet \"%s\" not found.\n"
+#: src/dird/ua_run.c:425
+msgid "Select replace option"
 msgstr ""
 
-#: src/dird/ua_run.c:426
-#, c-format
-msgid "No authorization. FileSet \"%s\".\n"
+#: src/dird/ua_run.c:435
+msgid ""
+"You must set the bootstrap file to NULL to be able to specify a JobId.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:434
-#, c-format
-msgid "Verify Job \"%s\" not found.\n"
+#: src/dird/ua_run.c:455
+msgid "Job failed.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:444
+#: src/dird/ua_run.c:458
 #, c-format
-msgid "Migration Job \"%s\" not found.\n"
+msgid "Job queued. JobId=%s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:479 src/dird/ua_run.c:643
-msgid "Invalid time, using current time.\n"
+#: src/dird/ua_run.c:464
+msgid "Job not run.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:499
+#: src/dird/ua_run.c:476
 #, c-format
-msgid "Invalid replace option: %s\n"
-msgstr ""
-
-#: src/dird/ua_run.c:563
-msgid "OK to run? (yes/mod/no): "
+msgid "strip_prefix=%s add_prefix=%s add_suffix=%s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:570 src/dird/ua_select.c:63
-msgid "mod"
+#: src/dird/ua_run.c:479
+msgid "This will replace your current Where value\n"
 msgstr ""
 
-#: src/dird/ua_run.c:573 src/dird/ua_update.c:481
-msgid "Parameters to modify:\n"
+#: src/dird/ua_run.c:480
+msgid "Strip prefix"
 msgstr ""
 
-#: src/dird/ua_run.c:574
-msgid "Level"
+#: src/dird/ua_run.c:481
+msgid "Add prefix"
 msgstr ""
 
-#: src/dird/ua_run.c:579 src/wx-console/wxbrestorepanel.cpp:355
-#: src/wx-console/wxbrestorepanel.cpp:843
-#: src/wx-console/wxbrestorepanel.cpp:1890
-msgid "When"
+#: src/dird/ua_run.c:482
+msgid "Add file suffix"
 msgstr ""
 
-#: src/dird/ua_run.c:580 src/wx-console/wxbrestorepanel.cpp:356
-#: src/wx-console/wxbrestorepanel.cpp:1116
-#: src/wx-console/wxbrestorepanel.cpp:1892
-msgid "Priority"
+#: src/dird/ua_run.c:483
+msgid "Enter a regexp"
 msgstr ""
 
-#: src/dird/ua_run.c:584 src/dird/ua_select.c:492 src/dird/ua_select.c:582
-#: src/dird/ua_update.c:413 src/dird/ua_update.c:492
-#: src/wx-console/wxbrestorepanel.cpp:337
-#: src/wx-console/wxbrestorepanel.cpp:526
-#: src/wx-console/wxbrestorepanel.cpp:536
-#: src/wx-console/wxbrestorepanel.cpp:1806
-msgid "Pool"
+#: src/dird/ua_run.c:484
+msgid "Test filename manipulation"
 msgstr ""
 
-#: src/dird/ua_run.c:586
-msgid "Verify Job"
+#: src/dird/ua_run.c:485
+msgid "Use this ?"
 msgstr ""
 
-#: src/dird/ua_run.c:589 src/wx-console/wxbrestorepanel.cpp:348
-#: src/wx-console/wxbrestorepanel.cpp:1871
-msgid "Bootstrap"
+#: src/dird/ua_run.c:490
+msgid "Please enter path prefix to strip: "
 msgstr ""
 
-#: src/dird/ua_run.c:590 src/wx-console/wxbrestorepanel.cpp:349
-#: src/wx-console/wxbrestorepanel.cpp:1092
-#: src/wx-console/wxbrestorepanel.cpp:1873
-msgid "Where"
+#: src/dird/ua_run.c:498
+msgid "Please enter path prefix to add (/ for none): "
 msgstr ""
 
-#: src/dird/ua_run.c:591 src/wx-console/wxbrestorepanel.cpp:351
-#: src/wx-console/wxbrestorepanel.cpp:1100
-#: src/wx-console/wxbrestorepanel.cpp:1877
-#: src/wx-console/wxbrestorepanel.cpp:1878
-#: src/wx-console/wxbrestorepanel.cpp:1879
-#: src/wx-console/wxbrestorepanel.cpp:1880
-#: src/wx-console/wxbrestorepanel.cpp:1881
-msgid "Replace"
+#: src/dird/ua_run.c:509
+msgid "Please enter file suffix to add: "
 msgstr ""
 
-#: src/dird/ua_run.c:592
-msgid "JobId"
+#: src/dird/ua_run.c:516
+msgid "Please enter a valid regexp (!from!to!): "
 msgstr ""
 
-#: src/dird/ua_run.c:594 src/dird/ua_update.c:497
-msgid "Select parameter to modify"
-msgstr ""
-
-#: src/dird/ua_run.c:635
-msgid ""
-"Please enter desired start time as YYYY-MM-DD HH:MM:SS (return for now): "
-msgstr ""
-
-#: src/dird/ua_run.c:650
-msgid "Enter new Priority: "
-msgstr ""
-
-#: src/dird/ua_run.c:654
-msgid "Priority must be a positive integer.\n"
-msgstr ""
-
-#: src/dird/ua_run.c:674
-msgid "Please enter the Bootstrap file name: "
-msgstr ""
-
-#: src/dird/ua_run.c:685
+#: src/dird/ua_run.c:529
 #, c-format
-msgid "Warning cannot open %s: ERR=%s\n"
+msgid "regexwhere=%s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:704
-msgid "Please enter path prefix for restore (/ for none): "
-msgstr ""
-
-#: src/dird/ua_run.c:718
-msgid "Replace:\n"
-msgstr ""
-
-#: src/dird/ua_run.c:722
-msgid "Select replace option"
+#: src/dird/ua_run.c:535
+#, c-format
+msgid "strip_prefix=%s add_prefix=%s add_suffix=%s result=%s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:732
-msgid ""
-"You must set the bootstrap file to NULL to be able to specify a JobId.\n"
+#: src/dird/ua_run.c:542
+msgid "Cannot use your regexp\n"
 msgstr ""
 
-#: src/dird/ua_run.c:757
-msgid "Job failed.\n"
+#: src/dird/ua_run.c:546
+msgid "Please enter filename to test: "
 msgstr ""
 
-#: src/dird/ua_run.c:760
+#: src/dird/ua_run.c:548
 #, c-format
-msgid "Job queued. JobId=%s\n"
+msgid "%s -> %s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:766
-msgid "Job not run.\n"
+#: src/dird/ua_run.c:592
+msgid "Cannot use your regexp.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:774 src/dird/ua_run.c:800
+#: src/dird/ua_run.c:605 src/dird/ua_run.c:631
 msgid "Levels:\n"
 msgstr ""
 
-#: src/dird/ua_run.c:775 src/filed/status.c:371 src/lib/util.c:329
-#: src/stored/status.c:534
+#: src/dird/ua_run.c:606 src/filed/status.c:373 src/lib/util.c:329
+#: src/stored/status.c:560
 msgid "Base"
 msgstr ""
 
-#: src/dird/ua_run.c:776 src/filed/status.c:373 src/lib/util.c:331
-#: src/stored/status.c:536
+#: src/dird/ua_run.c:607 src/filed/status.c:375 src/lib/util.c:331
+#: src/stored/status.c:562
 msgid "Full"
 msgstr ""
 
-#: src/dird/ua_run.c:777 src/filed/status.c:376 src/lib/util.c:334
-#: src/stored/status.c:539
+#: src/dird/ua_run.c:608 src/filed/status.c:378 src/lib/util.c:334
+#: src/stored/status.c:565
 msgid "Incremental"
 msgstr ""
 
-#: src/dird/ua_run.c:778 src/filed/status.c:379 src/lib/util.c:337
-#: src/stored/status.c:542
+#: src/dird/ua_run.c:609 src/filed/status.c:381 src/lib/util.c:337
+#: src/stored/status.c:568
 msgid "Differential"
 msgstr ""
 
-#: src/dird/ua_run.c:779 src/filed/status.c:382 src/lib/util.c:340
-#: src/stored/status.c:545
+#: src/dird/ua_run.c:610 src/filed/status.c:384 src/lib/util.c:340
+#: src/stored/status.c:571
 msgid "Since"
 msgstr ""
 
-#: src/dird/ua_run.c:780 src/dird/ua_run.c:806
+#: src/dird/ua_run.c:611 src/dird/ua_run.c:637
 msgid "Select level"
 msgstr ""
 
-#: src/dird/ua_run.c:801
+#: src/dird/ua_run.c:632
 msgid "Initialize Catalog"
 msgstr ""
 
-#: src/dird/ua_run.c:802 src/filed/status.c:385 src/lib/util.c:343
-#: src/stored/status.c:548
+#: src/dird/ua_run.c:633 src/filed/status.c:387 src/lib/util.c:343
+#: src/stored/status.c:574
 msgid "Verify Catalog"
 msgstr ""
 
-#: src/dird/ua_run.c:803 src/lib/util.c:349
+#: src/dird/ua_run.c:634 src/lib/util.c:349
 msgid "Verify Volume to Catalog"
 msgstr ""
 
-#: src/dird/ua_run.c:804 src/lib/util.c:352
+#: src/dird/ua_run.c:635 src/lib/util.c:352
 msgid "Verify Disk to Catalog"
 msgstr ""
 
-#: src/dird/ua_run.c:805
+#: src/dird/ua_run.c:636
 msgid "Verify Volume Data (not yet implemented)"
 msgstr ""
 
-#: src/dird/ua_run.c:826
+#: src/dird/ua_run.c:657
 msgid "Level not appropriate for this Job. Cannot be changed.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:839
+#: src/dird/ua_run.c:671
 #, c-format
 msgid ""
 "Run %s job\n"
@@ -4198,11 +4257,11 @@ msgid ""
 "Priority: %d\n"
 msgstr ""
 
-#: src/dird/ua_run.c:846 src/lib/util.c:296
+#: src/dird/ua_run.c:678 src/lib/util.c:296
 msgid "Admin"
 msgstr ""
 
-#: src/dird/ua_run.c:858
+#: src/dird/ua_run.c:691
 #, c-format
 msgid ""
 "Run %s job\n"
@@ -4216,11 +4275,11 @@ msgid ""
 "Priority: %d\n"
 msgstr ""
 
-#: src/dird/ua_run.c:867 src/lib/util.c:287
+#: src/dird/ua_run.c:700 src/lib/util.c:287
 msgid "Backup"
 msgstr ""
 
-#: src/dird/ua_run.c:889
+#: src/dird/ua_run.c:723
 #, c-format
 msgid ""
 "Run %s job\n"
@@ -4236,37 +4295,69 @@ msgid ""
 "Priority:    %d\n"
 msgstr ""
 
-#: src/dird/ua_run.c:900 src/lib/util.c:290
+#: src/dird/ua_run.c:734 src/lib/util.c:290
 msgid "Verify"
 msgstr ""
 
-#: src/dird/ua_run.c:918
+#: src/dird/ua_run.c:752
 msgid "Please enter a JobId for restore: "
 msgstr ""
 
-#: src/dird/ua_run.c:927
+#: src/dird/ua_run.c:764
 #, c-format
 msgid ""
 "Run Restore job\n"
-"JobName:    %s\n"
-"Bootstrap:  %s\n"
-"Where:      %s\n"
-"Replace:    %s\n"
-"FileSet:    %s\n"
-"Client:     %s\n"
-"Storage:    %s\n"
-"When:       %s\n"
-"Catalog:    %s\n"
-"Priority:   %d\n"
+"JobName:        f%s\n"
+"Bootstrap:       %s\n"
+"RegexWhere:      %s\n"
+"Replace:         %s\n"
+"FileSet:         %s\n"
+"Backup Client:   %s\n"
+"Restore Client:  %s\n"
+"Storage:         %s\n"
+"When:            %s\n"
+"Catalog:         %s\n"
+"Priority:        %d\n"
+msgstr ""
+
+#: src/dird/ua_run.c:789
+#, c-format
+msgid ""
+"Run Restore job\n"
+"JobName:         %s\n"
+"Bootstrap:       %s\n"
+"Where:           %s\n"
+"Replace:         %s\n"
+"FileSet:         %s\n"
+"Backup Client:   %s\n"
+"Restore Client:  %s\n"
+"Storage:         %s\n"
+"When:            %s\n"
+"Catalog:         %s\n"
+"Priority:        %d\n"
 msgstr ""
 
-#: src/dird/ua_run.c:949
+#: src/dird/ua_run.c:816
 #, c-format
 msgid ""
 "Run Restore job\n"
 "JobName:    %s\n"
 "Bootstrap:  %s\n"
-"Where:      %s\n"
+msgstr ""
+
+#: src/dird/ua_run.c:824
+#, c-format
+msgid "RegexWhere: %s\n"
+msgstr ""
+
+#: src/dird/ua_run.c:827
+#, c-format
+msgid "Where:      %s\n"
+msgstr ""
+
+#: src/dird/ua_run.c:831
+#, c-format
+msgid ""
 "Replace:    %s\n"
 "Client:     %s\n"
 "Storage:    %s\n"
@@ -4276,7 +4367,7 @@ msgid ""
 "Priority:   %d\n"
 msgstr ""
 
-#: src/dird/ua_run.c:974
+#: src/dird/ua_run.c:850
 #, c-format
 msgid ""
 "Run Migration job\n"
@@ -4293,11 +4384,171 @@ msgid ""
 "Priority:      %d\n"
 msgstr ""
 
-#: src/dird/ua_run.c:999
+#: src/dird/ua_run.c:875
 #, c-format
 msgid "Unknown Job Type=%d\n"
 msgstr ""
 
+#: src/dird/ua_run.c:935
+#, c-format
+msgid "Value missing for keyword %s\n"
+msgstr ""
+
+#: src/dird/ua_run.c:942
+msgid "Job name specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:950
+msgid "JobId specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:959 src/dird/ua_run.c:1103
+msgid "Client specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:967
+msgid "FileSet specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:975
+msgid "Level specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:984
+msgid "Storage specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:992
+msgid "RegexWhere or Where specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:997
+msgid "No authorization for \"regexwhere\" specification.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1004
+msgid "Where or RegexWhere specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1009
+msgid "No authoriztion for \"where\" specification.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1016
+msgid "Bootstrap specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1024
+msgid "Replace specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1032
+msgid "When specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1040
+msgid "Priority specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1045
+msgid "Priority must be positive nonzero setting it to 10.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1055
+msgid "Verify Job specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1087
+msgid "Migration Job specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1095
+msgid "Pool specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1111
+msgid "Restore Client specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1135
+#, c-format
+msgid "Invalid keyword: %s\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1146
+#, c-format
+msgid "Catalog \"%s\" not found\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1150
+#, c-format
+msgid "No authorization. Catalog \"%s\".\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1161
+#, c-format
+msgid "Job \"%s\" not found\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1168
+msgid "A job name must be specified.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1174
+#, c-format
+msgid "No authorization. Job \"%s\".\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1182
+#, c-format
+msgid "Pool \"%s\" not found.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1192
+#, c-format
+msgid "No authorization. Pool \"%s\".\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1202
+#, c-format
+msgid "Storage \"%s\" not found.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1214
+#, c-format
+msgid "No authorization. Storage \"%s\".\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1234 src/dird/ua_run.c:1254
+#, c-format
+msgid "No authorization. Client \"%s\".\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1244
+#, c-format
+msgid "Restore Client \"%s\" not found.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1264
+#, c-format
+msgid "FileSet \"%s\" not found.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1273
+#, c-format
+msgid "No authorization. FileSet \"%s\".\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1281
+#, c-format
+msgid "Verify Job \"%s\" not found.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1291
+#, c-format
+msgid "Migration Job \"%s\" not found.\n"
+msgstr ""
+
 #: src/dird/ua_select.c:55
 #, c-format
 msgid "The current %s retention period is: %s\n"
@@ -4327,196 +4578,201 @@ msgstr ""
 msgid "Select Storage resource"
 msgstr ""
 
-#: src/dird/ua_select.c:217
+#: src/dird/ua_select.c:224
+msgid "You must specify a \"use <catalog-name>\" command before continuing.\n"
+msgstr ""
+
+#: src/dird/ua_select.c:230
 msgid "The defined Catalog resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:225
+#: src/dird/ua_select.c:238
 msgid "Catalog"
 msgstr ""
 
-#: src/dird/ua_select.c:225
+#: src/dird/ua_select.c:238
 msgid "Select Catalog resource"
 msgstr ""
 
-#: src/dird/ua_select.c:242
+#: src/dird/ua_select.c:255
 msgid "The defined Job resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:250
+#: src/dird/ua_select.c:263
 msgid "Select Job resource"
 msgstr ""
 
-#: src/dird/ua_select.c:265
+#: src/dird/ua_select.c:278
 msgid "The defined Restore Job resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:273
+#: src/dird/ua_select.c:286
 msgid "Select Restore Job"
 msgstr ""
 
-#: src/dird/ua_select.c:290
+#: src/dird/ua_select.c:303
 msgid "The defined Client resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:298
+#: src/dird/ua_select.c:311
 msgid "Select Client (File daemon) resource"
 msgstr ""
 
-#: src/dird/ua_select.c:325
+#: src/dird/ua_select.c:338
 #, c-format
 msgid "Error: Client resource %s does not exist.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:350
+#: src/dird/ua_select.c:363
 #, c-format
 msgid "Could not find Client %s: ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:360 src/dird/ua_select.c:414
+#: src/dird/ua_select.c:373 src/dird/ua_select.c:427
 #, c-format
 msgid "Could not find Client \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:389
+#: src/dird/ua_select.c:402
 #, c-format
 msgid "Error obtaining client ids. ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:393
+#: src/dird/ua_select.c:406
 msgid "No clients defined. You must run a job before using this command.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:397
+#: src/dird/ua_select.c:410
 msgid "Defined Clients:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:407
+#: src/dird/ua_select.c:420
 msgid "Select the Client"
 msgstr ""
 
-#: src/dird/ua_select.c:440 src/dird/ua_select.c:463 src/dird/ua_select.c:499
+#: src/dird/ua_select.c:453 src/dird/ua_select.c:477 src/dird/ua_select.c:513
 #, c-format
 msgid "Could not find Pool \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:478
+#: src/dird/ua_select.c:492
 msgid "No pools defined. Use the \"create\" command to create one.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:482
+#: src/dird/ua_select.c:496
 msgid "Defined Pools:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:492
+#: src/dird/ua_select.c:506
 msgid "Select the Pool"
 msgstr ""
 
-#: src/dird/ua_select.c:522
+#: src/dird/ua_select.c:536
 #, c-format
 msgid "No access to Pool \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_select.c:548
+#: src/dird/ua_select.c:562
 msgid "Enter MediaId or Volume name: "
 msgstr ""
 
-#: src/dird/ua_select.c:574
+#: src/dird/ua_select.c:588
 msgid "The defined Pool resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:582
+#: src/dird/ua_select.c:596
 msgid "Select Pool resource"
 msgstr ""
 
-#: src/dird/ua_select.c:617
+#: src/dird/ua_select.c:631
 msgid "Enter the JobId to select: "
 msgstr ""
 
-#: src/dird/ua_select.c:655
+#: src/dird/ua_select.c:669
 #, c-format
 msgid "Could not find Job \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:733
+#: src/dird/ua_select.c:749
 #, c-format
 msgid "Automatically selected %s: %s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:738
+#: src/dird/ua_select.c:754
 #, c-format
 msgid "Cannot select %s in batch mode.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:752
+#: src/dird/ua_select.c:772
 #, c-format
 msgid "Selection list for \"%s\" is empty!\n"
 msgstr ""
 
-#: src/dird/ua_select.c:758
-msgid "Item 1 selected automatically.\n"
+#: src/dird/ua_select.c:778
+#, c-format
+msgid "Automatically selected: %s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:769
+#: src/dird/ua_select.c:790
 msgid "Selection aborted, nothing done.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:774
+#: src/dird/ua_select.c:795
 #, c-format
 msgid "Please enter a number between 1 and %d\n"
 msgstr ""
 
-#: src/dird/ua_select.c:823
+#: src/dird/ua_select.c:844
 msgid "Storage name given twice.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:840
+#: src/dird/ua_select.c:861
 #, c-format
 msgid "Expecting jobid=nn command, got: %s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:844
+#: src/dird/ua_select.c:865
 #, c-format
 msgid "JobId %s is not running.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:854
+#: src/dird/ua_select.c:875
 #, c-format
 msgid "Expecting job=xxx, got: %s.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:858 src/dird/ua_select.c:870
+#: src/dird/ua_select.c:879 src/dird/ua_select.c:891
 #, c-format
 msgid "Job \"%s\" is not running.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:866
+#: src/dird/ua_select.c:887
 #, c-format
 msgid "Expecting ujobid=xxx, got: %s.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:886
+#: src/dird/ua_select.c:907
 #, c-format
 msgid "Storage resource \"%s\": not found\n"
 msgstr ""
 
-#: src/dird/ua_select.c:918
+#: src/dird/ua_select.c:939
 msgid "Enter autochanger drive[0]: "
 msgstr ""
 
-#: src/dird/ua_select.c:939
+#: src/dird/ua_select.c:960
 msgid "Enter autochanger slot: "
 msgstr ""
 
-#: src/dird/ua_select.c:969
+#: src/dird/ua_select.c:990
 msgid "Media Types defined in conf file:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:975
+#: src/dird/ua_select.c:996
 msgid "Media Type"
 msgstr ""
 
-#: src/dird/ua_select.c:975
+#: src/dird/ua_select.c:996
 msgid "Select the Media Type"
 msgstr ""
 
@@ -4525,44 +4781,39 @@ msgstr ""
 msgid "Cannot create UA thread: %s\n"
 msgstr ""
 
-#: src/dird/ua_server.c:154
+#: src/dird/ua_server.c:159
 msgid "You have messages.\n"
 msgstr ""
 
-#: src/dird/ua_status.c:135
+#: src/dird/ua_status.c:143
 msgid "Status available for:\n"
 msgstr ""
 
-#: src/dird/ua_status.c:141
+#: src/dird/ua_status.c:149
 msgid "Select daemon type for status"
 msgstr ""
 
-#: src/dird/ua_status.c:255 src/stored/status.c:77
-#, c-format
-msgid "%s Version: %s (%s) %s %s %s\n"
-msgstr ""
-
-#: src/dird/ua_status.c:259
+#: src/dird/ua_status.c:267
 #, c-format
 msgid "Daemon started %s, 1 Job run since started.\n"
 msgstr ""
 
-#: src/dird/ua_status.c:262
+#: src/dird/ua_status.c:270
 #, c-format
 msgid "Daemon started %s, %d Jobs run since started.\n"
 msgstr ""
 
-#: src/dird/ua_status.c:265 src/filed/status.c:127 src/stored/status.c:88
+#: src/dird/ua_status.c:273 src/filed/status.c:129 src/stored/status.c:90
 #, c-format
-msgid " Heap: bytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"
+msgid " Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"
 msgstr ""
 
-#: src/dird/ua_status.c:285 src/dird/ua_status.c:509 src/dird/ua_status.c:675
-#: src/filed/status.c:200 src/filed/status.c:218 src/filed/status.c:280
+#: src/dird/ua_status.c:299 src/dird/ua_status.c:526 src/dird/ua_status.c:702
+#: src/filed/status.c:204 src/filed/status.c:220 src/filed/status.c:282
 msgid "====\n"
 msgstr ""
 
-#: src/dird/ua_status.c:300
+#: src/dird/ua_status.c:314
 #, c-format
 msgid ""
 "\n"
@@ -4570,275 +4821,287 @@ msgid ""
 "====\n"
 msgstr ""
 
-#: src/dird/ua_status.c:338
+#: src/dird/ua_status.c:352
 #, c-format
 msgid ""
 "Failed to connect to Client %s.\n"
 "====\n"
 msgstr ""
 
-#: src/dird/ua_status.c:346
+#: src/dird/ua_status.c:360
 msgid "Connected to file daemon\n"
 msgstr ""
 
-#: src/dird/ua_status.c:361
+#: src/dird/ua_status.c:375
 msgid ""
 "\n"
 "Scheduled Jobs:\n"
 msgstr ""
 
-#: src/dird/ua_status.c:362
+#: src/dird/ua_status.c:376
 msgid ""
 "Level          Type     Pri  Scheduled          Name               Volume\n"
 msgstr ""
 
-#: src/dird/ua_status.c:363
+#: src/dird/ua_status.c:377
 msgid "===================================================================================\n"
 msgstr ""
 
-#: src/dird/ua_status.c:413
+#: src/dird/ua_status.c:429
 #, c-format
 msgid "%-14s %-8s %3d  %-18s %-18s %s\n"
 msgstr ""
 
-#: src/dird/ua_status.c:507
+#: src/dird/ua_status.c:524
 msgid "No Scheduled Jobs.\n"
 msgstr ""
 
-#: src/dird/ua_status.c:524 src/filed/status.c:141 src/stored/status.c:347
+#: src/dird/ua_status.c:541 src/filed/status.c:144 src/stored/status.c:370
 msgid ""
 "\n"
 "Running Jobs:\n"
 msgstr ""
 
-#: src/dird/ua_status.c:532
+#: src/dird/ua_status.c:549
 #, c-format
 msgid "Console connected at %s\n"
 msgstr ""
 
-#: src/dird/ua_status.c:542
+#: src/dird/ua_status.c:559
 msgid ""
 "No Jobs running.\n"
 "====\n"
 msgstr ""
 
-#: src/dird/ua_status.c:547
+#: src/dird/ua_status.c:564
 msgid " JobId Level   Name                       Status\n"
 msgstr ""
 
-#: src/dird/ua_status.c:548 src/filed/status.c:224
+#: src/dird/ua_status.c:565 src/filed/status.c:226
 msgid "======================================================================\n"
 msgstr ""
 
-#: src/dird/ua_status.c:556
+#: src/dird/ua_status.c:573
 msgid "is waiting execution"
 msgstr ""
 
-#: src/dird/ua_status.c:559
+#: src/dird/ua_status.c:576
 msgid "is running"
 msgstr ""
 
-#: src/dird/ua_status.c:562
+#: src/dird/ua_status.c:579
 msgid "is blocked"
 msgstr ""
 
-#: src/dird/ua_status.c:565
+#: src/dird/ua_status.c:582
 msgid "has terminated"
 msgstr ""
 
-#: src/dird/ua_status.c:568
+#: src/dird/ua_status.c:585
 msgid "has erred"
 msgstr ""
 
-#: src/dird/ua_status.c:571
+#: src/dird/ua_status.c:588
 msgid "has errors"
 msgstr ""
 
-#: src/dird/ua_status.c:574
+#: src/dird/ua_status.c:591
 msgid "has a fatal error"
 msgstr ""
 
-#: src/dird/ua_status.c:577
+#: src/dird/ua_status.c:594
 msgid "has verify differences"
 msgstr ""
 
-#: src/dird/ua_status.c:580
+#: src/dird/ua_status.c:597
 msgid "has been canceled"
 msgstr ""
 
-#: src/dird/ua_status.c:584
+#: src/dird/ua_status.c:602
+msgid "is waiting on Client"
+msgstr ""
+
+#: src/dird/ua_status.c:604
 #, c-format
 msgid "is waiting on Client %s"
 msgstr ""
 
-#: src/dird/ua_status.c:591 src/dird/ua_status.c:593
+#: src/dird/ua_status.c:612 src/dird/ua_status.c:614
 #, c-format
 msgid "is waiting on Storage %s"
 msgstr ""
 
-#: src/dird/ua_status.c:599
+#: src/dird/ua_status.c:616
+msgid "is waiting on Storage"
+msgstr ""
+
+#: src/dird/ua_status.c:622
 msgid "is waiting on max Storage jobs"
 msgstr ""
 
-#: src/dird/ua_status.c:602
+#: src/dird/ua_status.c:625
 msgid "is waiting on max Client jobs"
 msgstr ""
 
-#: src/dird/ua_status.c:605
+#: src/dird/ua_status.c:628
 msgid "is waiting on max Job jobs"
 msgstr ""
 
-#: src/dird/ua_status.c:608
+#: src/dird/ua_status.c:631
 msgid "is waiting on max total jobs"
 msgstr ""
 
-#: src/dird/ua_status.c:611
+#: src/dird/ua_status.c:634
 msgid "is waiting for its start time"
 msgstr ""
 
-#: src/dird/ua_status.c:614
+#: src/dird/ua_status.c:637
 msgid "is waiting for higher priority jobs to finish"
 msgstr ""
 
-#: src/dird/ua_status.c:619
+#: src/dird/ua_status.c:642
 #, c-format
 msgid "is in unknown state %c"
 msgstr ""
 
-#: src/dird/ua_status.c:633
+#: src/dird/ua_status.c:656
 msgid "is waiting for a mount request"
 msgstr ""
 
-#: src/dird/ua_status.c:640
+#: src/dird/ua_status.c:663
 msgid "is waiting for an appendable Volume"
 msgstr ""
 
-#: src/dird/ua_status.c:647
+#: src/dird/ua_status.c:671
+msgid "is waiting for Client to connect to Storage daemon"
+msgstr ""
+
+#: src/dird/ua_status.c:673
 #, c-format
 msgid "is waiting for Client %s to connect to Storage %s"
 msgstr ""
 
-#: src/dird/ua_status.c:663
+#: src/dird/ua_status.c:690
 #, c-format
 msgid "%6d %-6s  %-20s %s\n"
 msgstr ""
 
-#: src/dird/ua_status.c:685
+#: src/dird/ua_status.c:712
 msgid "No Terminated Jobs.\n"
 msgstr ""
 
-#: src/dird/ua_status.c:690 src/filed/status.c:214 src/stored/status.c:456
+#: src/dird/ua_status.c:717 src/filed/status.c:216 src/stored/status.c:482
 msgid ""
 "\n"
 "Terminated Jobs:\n"
 msgstr ""
 
-#: src/dird/ua_status.c:691 src/filed/status.c:222 src/stored/status.c:463
+#: src/dird/ua_status.c:718 src/filed/status.c:224 src/stored/status.c:489
 msgid " JobId  Level    Files      Bytes   Status   Finished        Name \n"
 msgstr ""
 
-#: src/dird/ua_status.c:692
+#: src/dird/ua_status.c:719
 msgid "====================================================================\n"
 msgstr ""
 
-#: src/dird/ua_status.c:723 src/filed/status.c:244 src/lib/util.c:179
-#: src/stored/status.c:485
+#: src/dird/ua_status.c:750 src/filed/status.c:246 src/lib/util.c:179
+#: src/stored/status.c:511
 msgid "Created"
 msgstr ""
 
-#: src/dird/ua_status.c:727 src/filed/status.c:248 src/lib/util.c:192
-#: src/lib/util.c:259 src/stored/status.c:489
+#: src/dird/ua_status.c:754 src/filed/status.c:250 src/lib/util.c:192
+#: src/lib/util.c:259 src/stored/status.c:515
 msgid "Error"
 msgstr ""
 
-#: src/dird/ua_status.c:730 src/filed/status.c:251 src/stored/status.c:492
+#: src/dird/ua_status.c:757 src/filed/status.c:253 src/stored/status.c:518
 msgid "Diffs"
 msgstr ""
 
-#: src/dird/ua_status.c:736 src/filed/status.c:257 src/lib/util.c:188
-#: src/lib/util.c:255 src/stored/btape.c:1187 src/stored/status.c:498
+#: src/dird/ua_status.c:763 src/filed/status.c:259 src/lib/util.c:188
+#: src/lib/util.c:255 src/stored/btape.c:1189 src/stored/status.c:524
 #: src/wx-console/wxbconfigpanel.cpp:201
 msgid "OK"
 msgstr ""
 
-#: src/dird/ua_status.c:739 src/filed/status.c:260 src/stored/status.c:501
+#: src/dird/ua_status.c:766 src/filed/status.c:262 src/stored/status.c:527
 msgid "Other"
 msgstr ""
 
-#: src/dird/ua_status.c:742 src/filed/status.c:271 src/stored/status.c:512
+#: src/dird/ua_status.c:769 src/filed/status.c:273 src/stored/status.c:538
 #, c-format
 msgid "%6d  %-6s %8s %10s  %-7s  %-8s %s\n"
 msgstr ""
 
-#: src/dird/ua_status.c:750
+#: src/dird/ua_status.c:777 src/stored/btape.c:195
 msgid "\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:71
+#: src/dird/ua_tree.c:72
 msgid "change current directory"
 msgstr ""
 
-#: src/dird/ua_tree.c:72
+#: src/dird/ua_tree.c:73
 msgid "count marked files in and below the cd"
 msgstr ""
 
-#: src/dird/ua_tree.c:73 src/dird/ua_tree.c:74
+#: src/dird/ua_tree.c:74 src/dird/ua_tree.c:75
 msgid "long list current directory, wildcards allowed"
 msgstr ""
 
-#: src/dird/ua_tree.c:75
+#: src/dird/ua_tree.c:76
 msgid "leave file selection mode"
 msgstr ""
 
-#: src/dird/ua_tree.c:76
+#: src/dird/ua_tree.c:77
 msgid "estimate restore size"
 msgstr ""
 
-#: src/dird/ua_tree.c:77
+#: src/dird/ua_tree.c:78
 msgid "same as done command"
 msgstr ""
 
-#: src/dird/ua_tree.c:78
+#: src/dird/ua_tree.c:79
 msgid "find files, wildcards allowed"
 msgstr ""
 
-#: src/dird/ua_tree.c:79 src/dird/ua_tree.c:88
+#: src/dird/ua_tree.c:80 src/dird/ua_tree.c:90
 msgid "print help"
 msgstr ""
 
-#: src/dird/ua_tree.c:80
+#: src/dird/ua_tree.c:81
 msgid "list current directory, wildcards allowed"
 msgstr ""
 
-#: src/dird/ua_tree.c:81
+#: src/dird/ua_tree.c:82
 msgid "list the marked files in and below the cd"
 msgstr ""
 
-#: src/dird/ua_tree.c:82
+#: src/dird/ua_tree.c:83
 msgid "mark dir/file to be restored recursively, wildcards allowed"
 msgstr ""
 
-#: src/dird/ua_tree.c:83
+#: src/dird/ua_tree.c:84
 msgid "mark directory name to be restored (no files)"
 msgstr ""
 
-#: src/dird/ua_tree.c:84
+#: src/dird/ua_tree.c:85 src/dird/ua_tree.c:86
 msgid "print current working directory"
 msgstr ""
 
-#: src/dird/ua_tree.c:85
+#: src/dird/ua_tree.c:87
 msgid "unmark dir/file to be restored recursively in dir"
 msgstr ""
 
-#: src/dird/ua_tree.c:86
+#: src/dird/ua_tree.c:88
 msgid "unmark directory name only no recursion"
 msgstr ""
 
-#: src/dird/ua_tree.c:87
+#: src/dird/ua_tree.c:89
 msgid "quit and do not do restore"
 msgstr ""
 
-#: src/dird/ua_tree.c:107
+#: src/dird/ua_tree.c:110
 msgid ""
 "\n"
 "You are now entering file selection mode where you add (mark) and\n"
@@ -4848,556 +5111,549 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:117 src/dird/ua_tree.c:686 src/dird/ua_tree.c:694
+#: src/dird/ua_tree.c:120 src/dird/ua_tree.c:716
 #, c-format
 msgid "cwd is: %s\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:125 src/dird/ua_tree.c:139
-msgid "Illegal command. Enter \"done\" to exit.\n"
+#: src/dird/ua_tree.c:129 src/dird/ua_tree.c:144
+msgid "Invalid command. Enter \"done\" to exit.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:312 src/dird/ua_tree.c:323 src/dird/ua_tree.c:340
+#: src/dird/ua_tree.c:331 src/dird/ua_tree.c:343 src/dird/ua_tree.c:360
 msgid "No files marked.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:325
+#: src/dird/ua_tree.c:345
 msgid "1 file marked.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:327
+#: src/dird/ua_tree.c:347
 #, c-format
 msgid "%s files marked.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:354
+#: src/dird/ua_tree.c:375
 msgid "No directories marked.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:356
+#: src/dird/ua_tree.c:377
 msgid "1 directory marked.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:358
+#: src/dird/ua_tree.c:379
 #, c-format
 msgid "%s directories marked.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:379
+#: src/dird/ua_tree.c:400
 #, c-format
 msgid "%s total files/dirs. %s marked to be restored.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:390
+#: src/dird/ua_tree.c:411
 msgid "No file specification given.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:541
+#: src/dird/ua_tree.c:562
 #, c-format
 msgid "Node %s has no children.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:632
+#: src/dird/ua_tree.c:653
 #, c-format
 msgid "%d total files; %d marked to be restored; %s bytes.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:666
-msgid "Too many arguments. Try using double quotes.\n"
+#: src/dird/ua_tree.c:687
+msgid "Too few or too many arguments. Try using double quotes.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:678
+#: src/dird/ua_tree.c:699
 msgid "Invalid path given.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:705 src/dird/ua_tree.c:716
+#: src/dird/ua_tree.c:735 src/dird/ua_tree.c:747
 msgid "No files unmarked.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:718
+#: src/dird/ua_tree.c:749
 msgid "1 file unmarked.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:721
+#: src/dird/ua_tree.c:752
 #, c-format
 msgid "%s files unmarked.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:732 src/dird/ua_tree.c:748
+#: src/dird/ua_tree.c:763 src/dird/ua_tree.c:780
 msgid "No directories unmarked.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:750
+#: src/dird/ua_tree.c:782
 msgid "1 directory unmarked.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:752
+#: src/dird/ua_tree.c:784
 #, c-format
 msgid "%d directories unmarked.\n"
 msgstr ""
 
-#: src/dird/ua_update.c:84
+#: src/dird/ua_update.c:89
 msgid "Update choice:\n"
 msgstr ""
 
-#: src/dird/ua_update.c:85
+#: src/dird/ua_update.c:90
 msgid "Volume parameters"
 msgstr ""
 
-#: src/dird/ua_update.c:86
+#: src/dird/ua_update.c:91
 msgid "Pool from resource"
 msgstr ""
 
-#: src/dird/ua_update.c:87
+#: src/dird/ua_update.c:92
 msgid "Slots from autochanger"
 msgstr ""
 
-#: src/dird/ua_update.c:88
+#: src/dird/ua_update.c:93
 msgid "item"
 msgstr ""
 
-#: src/dird/ua_update.c:88
+#: src/dird/ua_update.c:93
 msgid "Choose catalog item to update"
 msgstr ""
 
-#: src/dird/ua_update.c:128
+#: src/dird/ua_update.c:133
 #, c-format
 msgid "Invalid VolStatus specified: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:137
+#: src/dird/ua_update.c:142
 #, c-format
 msgid "New Volume status is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:147
+#: src/dird/ua_update.c:152
 #, c-format
 msgid "Invalid retention period specified: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:155
+#: src/dird/ua_update.c:160
 #, c-format
 msgid "New retention period is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:166
+#: src/dird/ua_update.c:171
 #, c-format
 msgid "Invalid use duration specified: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:174
+#: src/dird/ua_update.c:179
 #, c-format
 msgid "New use duration is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:188
+#: src/dird/ua_update.c:193
 #, c-format
 msgid "New max jobs is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:201
+#: src/dird/ua_update.c:206
 #, c-format
 msgid "New max files is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:212
+#: src/dird/ua_update.c:217
 #, c-format
 msgid "Invalid max. bytes specification: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:220
+#: src/dird/ua_update.c:225
 #, c-format
 msgid "New Max bytes is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:231 src/dird/ua_update.c:251
+#: src/dird/ua_update.c:236 src/dird/ua_update.c:256
 msgid "Invalid value. It must be yes or no.\n"
 msgstr ""
 
-#: src/dird/ua_update.c:239
+#: src/dird/ua_update.c:244
 #, c-format
 msgid "New Recycle flag is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:259
+#: src/dird/ua_update.c:264
 #, c-format
 msgid "New InChanger flag is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:277
+#: src/dird/ua_update.c:282
 #, c-format
 msgid "Invalid slot, it must be between 0 and MaxVols=%d\n"
 msgstr ""
 
-#: src/dird/ua_update.c:286 src/dird/ua_update.c:597
+#: src/dird/ua_update.c:291 src/dird/ua_update.c:637
 #, c-format
 msgid "Error updating media record Slot: ERR=%s"
 msgstr ""
 
-#: src/dird/ua_update.c:288
+#: src/dird/ua_update.c:293
 #, c-format
 msgid "New Slot is: %d\n"
 msgstr ""
 
-#: src/dird/ua_update.c:315
+#: src/dird/ua_update.c:318
 #, c-format
 msgid "New Pool is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:344
+#: src/dird/ua_update.c:352
+#, c-format
+msgid "New RecyclePool is: %s\n"
+msgstr ""
+
+#: src/dird/ua_update.c:372
 #, c-format
 msgid "Error updating Volume record: ERR=%s"
 msgstr ""
 
-#: src/dird/ua_update.c:346
+#: src/dird/ua_update.c:374
 #, c-format
 msgid "Volume defaults updated from \"%s\" Pool record.\n"
 msgstr ""
 
-#: src/dird/ua_update.c:368
+#: src/dird/ua_update.c:398
 #, c-format
 msgid "Error updating Volume records: ERR=%s"
 msgstr ""
 
-#: src/dird/ua_update.c:370
-msgid "All Volume defaults updated from Pool record.\n"
+#: src/dird/ua_update.c:400
+#, c-format
+msgid "All Volume defaults updated from \"%s\" Pool record.\n"
 msgstr ""
 
-#: src/dird/ua_update.c:381
+#: src/dird/ua_update.c:412
 #, c-format
 msgid "Error updating media record Enabled: ERR=%s"
 msgstr ""
 
-#: src/dird/ua_update.c:383
+#: src/dird/ua_update.c:414
 #, c-format
 msgid "New Enabled is: %d\n"
 msgstr ""
 
-#: src/dird/ua_update.c:404
-msgid "VolStatus"
-msgstr ""
-
-#: src/dird/ua_update.c:405
-msgid "VolRetention"
-msgstr ""
-
-#: src/dird/ua_update.c:406
-msgid "VolUse"
-msgstr ""
-
-#: src/dird/ua_update.c:407
-msgid "MaxVolJobs"
-msgstr ""
-
-#: src/dird/ua_update.c:408
-msgid "MaxVolFiles"
-msgstr ""
-
-#: src/dird/ua_update.c:409
-msgid "MaxVolBytes"
-msgstr ""
-
-#: src/dird/ua_update.c:410
-msgid "Recycle"
-msgstr ""
-
-#: src/dird/ua_update.c:411
-msgid "InChanger"
-msgstr ""
-
-#: src/dird/ua_update.c:412 src/dird/ua_update.c:489
-msgid "Slot"
-msgstr ""
-
-#: src/dird/ua_update.c:414
-msgid "FromPool"
-msgstr ""
-
-#: src/dird/ua_update.c:415
-msgid "AllFromPool"
-msgstr ""
-
-#: src/dird/ua_update.c:416 src/dird/ua_update.c:495
-msgid "Enabled"
-msgstr ""
-
-#: src/dird/ua_update.c:482
+#: src/dird/ua_update.c:519
 msgid "Volume Status"
 msgstr ""
 
-#: src/dird/ua_update.c:483
+#: src/dird/ua_update.c:520
 msgid "Volume Retention Period"
 msgstr ""
 
-#: src/dird/ua_update.c:484
+#: src/dird/ua_update.c:521
 msgid "Volume Use Duration"
 msgstr ""
 
-#: src/dird/ua_update.c:485
+#: src/dird/ua_update.c:522
 msgid "Maximum Volume Jobs"
 msgstr ""
 
-#: src/dird/ua_update.c:486
+#: src/dird/ua_update.c:523
 msgid "Maximum Volume Files"
 msgstr ""
 
-#: src/dird/ua_update.c:487
+#: src/dird/ua_update.c:524
 msgid "Maximum Volume Bytes"
 msgstr ""
 
-#: src/dird/ua_update.c:488
+#: src/dird/ua_update.c:525
 msgid "Recycle Flag"
 msgstr ""
 
-#: src/dird/ua_update.c:490
+#: src/dird/ua_update.c:526
+msgid "Slot"
+msgstr ""
+
+#: src/dird/ua_update.c:527
 msgid "InChanger Flag"
 msgstr ""
 
-#: src/dird/ua_update.c:491
+#: src/dird/ua_update.c:528
 msgid "Volume Files"
 msgstr ""
 
-#: src/dird/ua_update.c:493
+#: src/dird/ua_update.c:530
 msgid "Volume from Pool"
 msgstr ""
 
-#: src/dird/ua_update.c:494
+#: src/dird/ua_update.c:531
 msgid "All Volumes from Pool"
 msgstr ""
 
-#: src/dird/ua_update.c:496
+#: src/dird/ua_update.c:532
+msgid "Enabled"
+msgstr ""
+
+#: src/dird/ua_update.c:533
+msgid "RecyclePool"
+msgstr ""
+
+#: src/dird/ua_update.c:534
 msgid "Done"
 msgstr ""
 
-#: src/dird/ua_update.c:504
+#: src/dird/ua_update.c:542
 #, c-format
 msgid "Updating Volume \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_update.c:509
+#: src/dird/ua_update.c:547
 #, c-format
 msgid "Current Volume status is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:510
+#: src/dird/ua_update.c:548
 msgid "Possible Values are:\n"
 msgstr ""
 
-#: src/dird/ua_update.c:521
+#: src/dird/ua_update.c:559
 msgid "Choose new Volume Status"
 msgstr ""
 
-#: src/dird/ua_update.c:527
+#: src/dird/ua_update.c:565
 #, c-format
 msgid "Current retention period is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:529
+#: src/dird/ua_update.c:567
 msgid "Enter Volume Retention period: "
 msgstr ""
 
-#: src/dird/ua_update.c:536
+#: src/dird/ua_update.c:574
 #, c-format
 msgid "Current use duration is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:538
+#: src/dird/ua_update.c:576
 msgid "Enter Volume Use Duration: "
 msgstr ""
 
-#: src/dird/ua_update.c:545
+#: src/dird/ua_update.c:583
 #, c-format
 msgid "Current max jobs is: %u\n"
 msgstr ""
 
-#: src/dird/ua_update.c:546
+#: src/dird/ua_update.c:584
 msgid "Enter new Maximum Jobs: "
 msgstr ""
 
-#: src/dird/ua_update.c:553
+#: src/dird/ua_update.c:591
 #, c-format
 msgid "Current max files is: %u\n"
 msgstr ""
 
-#: src/dird/ua_update.c:554
+#: src/dird/ua_update.c:592
 msgid "Enter new Maximum Files: "
 msgstr ""
 
-#: src/dird/ua_update.c:561
+#: src/dird/ua_update.c:599
 #, c-format
 msgid "Current value is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:562
+#: src/dird/ua_update.c:600
 msgid "Enter new Maximum Bytes: "
 msgstr ""
 
-#: src/dird/ua_update.c:570
+#: src/dird/ua_update.c:608
 #, c-format
 msgid "Current recycle flag is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:572
+#: src/dird/ua_update.c:610
 msgid "Enter new Recycle status: "
 msgstr ""
 
-#: src/dird/ua_update.c:579
+#: src/dird/ua_update.c:617
 #, c-format
 msgid "Current Slot is: %d\n"
 msgstr ""
 
-#: src/dird/ua_update.c:580
+#: src/dird/ua_update.c:618
 msgid "Enter new Slot: "
 msgstr ""
 
-#: src/dird/ua_update.c:587
+#: src/dird/ua_update.c:625
 #, c-format
 msgid "Current InChanger flag is: %d\n"
 msgstr ""
 
-#: src/dird/ua_update.c:588
-msgid "Set InChanger flag? yes/no: "
+#: src/dird/ua_update.c:626
+#, c-format
+msgid "Set InChanger flag for Volume \"%s\": yes/no: "
 msgstr ""
 
-#: src/dird/ua_update.c:599
+#: src/dird/ua_update.c:639
 #, c-format
 msgid "New InChanger flag is: %d\n"
 msgstr ""
 
-#: src/dird/ua_update.c:606
+#: src/dird/ua_update.c:646
 msgid ""
 "Warning changing Volume Files can result\n"
 "in loss of data on your Volume\n"
 "\n"
 msgstr ""
 
-#: src/dird/ua_update.c:608
+#: src/dird/ua_update.c:648
 #, c-format
 msgid "Current Volume Files is: %u\n"
 msgstr ""
 
-#: src/dird/ua_update.c:609
+#: src/dird/ua_update.c:649
 msgid "Enter new number of Files for Volume: "
 msgstr ""
 
-#: src/dird/ua_update.c:614
+#: src/dird/ua_update.c:654
 msgid "Normally, you should only increase Volume Files by one!\n"
 msgstr ""
 
-#: src/dird/ua_update.c:615
-msgid "Continue? (yes/no): "
+#: src/dird/ua_update.c:655
+msgid "Increase Volume Files? (yes/no): "
 msgstr ""
 
-#: src/dird/ua_update.c:625
+#: src/dird/ua_update.c:665
 #, c-format
 msgid "New Volume Files is: %u\n"
 msgstr ""
 
-#: src/dird/ua_update.c:637
+#: src/dird/ua_update.c:677
 #, c-format
 msgid "Current Pool is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:638
+#: src/dird/ua_update.c:678
 msgid "Enter new Pool name: "
 msgstr ""
 
-#: src/dird/ua_update.c:652
+#: src/dird/ua_update.c:695
 #, c-format
 msgid "Current Enabled is: %d\n"
 msgstr ""
 
-#: src/dird/ua_update.c:653
+#: src/dird/ua_update.c:696
 msgid "Enter new Enabled: "
 msgstr ""
 
-#: src/dird/ua_update.c:669
+#: src/dird/ua_update.c:715
+#, c-format
+msgid "Current RecyclePool is: %s\n"
+msgstr ""
+
+#: src/dird/ua_update.c:717
+msgid "No current RecyclePool\n"
+msgstr ""
+
+#: src/dird/ua_update.c:719
+msgid "Enter new RecyclePool name: "
+msgstr ""
+
+#: src/dird/ua_update.c:726
 msgid "Selection terminated.\n"
 msgstr ""
 
-#: src/dird/ua_update.c:702
+#: src/dird/ua_update.c:760
 #, c-format
 msgid "db_update_pool_record returned %d. ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:709
+#: src/dird/ua_update.c:767
 msgid "Pool DB record updated from resource.\n"
 msgstr ""
 
-#: src/dird/verify.c:100
+#: src/dird/ua_update.c:794
+msgid "Expect JobId keyword, not found.\n"
+msgstr ""
+
+#: src/dird/ua_update.c:819
+msgid "Neither Client nor StartTime specified.\n"
+msgstr ""
+
+#: src/dird/verify.c:120
 msgid ""
 "Unable to find JobId of previous InitCatalog Job.\n"
 "Please run a Verify with Level=InitCatalog before\n"
 "running the current Job.\n"
 msgstr ""
 
-#: src/dird/verify.c:105
+#: src/dird/verify.c:125
 msgid "Unable to find JobId of previous Job for this client.\n"
 msgstr ""
 
-#: src/dird/verify.c:121
+#: src/dird/verify.c:141
 #, c-format
 msgid "Could not get job record for previous Job. ERR=%s"
 msgstr ""
 
-#: src/dird/verify.c:126
+#: src/dird/verify.c:146
 #, c-format
 msgid "Last Job %d did not terminate normally. JobStatus=%c\n"
 msgstr ""
 
-#: src/dird/verify.c:130
+#: src/dird/verify.c:150
 #, c-format
 msgid "Verifying against JobId=%d Job=%s\n"
 msgstr ""
 
-#: src/dird/verify.c:175
+#: src/dird/verify.c:179
 #, c-format
 msgid "Start Verify JobId=%s Level=%s Job=%s\n"
 msgstr ""
 
-#: src/dird/verify.c:259
+#: src/dird/verify.c:263
 msgid "Deprecated feature ... use bootstrap.\n"
 msgstr ""
 
-#: src/dird/verify.c:272
+#: src/dird/verify.c:276
 #, c-format
 msgid "Unimplemented Verify level %d(%c)\n"
 msgstr ""
 
-#: src/dird/verify.c:324
+#: src/dird/verify.c:330
 #, c-format
 msgid "Unimplemented verify level %d\n"
 msgstr ""
 
-#: src/dird/verify.c:378
+#: src/dird/verify.c:384
 msgid "Verify OK"
 msgstr ""
 
-#: src/dird/verify.c:382
+#: src/dird/verify.c:388
 msgid "*** Verify Error ***"
 msgstr ""
 
-#: src/dird/verify.c:386
+#: src/dird/verify.c:392
 msgid "Verify warnings"
 msgstr ""
 
-#: src/dird/verify.c:389
+#: src/dird/verify.c:395
 msgid "Verify Canceled"
 msgstr ""
 
-#: src/dird/verify.c:392
+#: src/dird/verify.c:398
 msgid "Verify Differences"
 msgstr ""
 
-#: src/dird/verify.c:397
+#: src/dird/verify.c:403
 #, c-format
 msgid "Inappropriate term code: %d %c\n"
 msgstr ""
 
-#: src/dird/verify.c:411
+#: src/dird/verify.c:417
 #, c-format
 msgid ""
-"Bacula %s (%s): %s\n"
+"Bacula %s %s (%s): %s\n"
+"  Build OS:               %s %s %s\n"
 "  JobId:                  %d\n"
 "  Job:                    %s\n"
 "  FileSet:                %s\n"
@@ -5416,10 +5672,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/verify.c:446
+#: src/dird/verify.c:452
 #, c-format
 msgid ""
-"Bacula %s (%s): %s\n"
+"Bacula %s %s (%s): %s\n"
+"  Build:                  %s %s %s\n"
 "  JobId:                  %d\n"
 "  Job:                    %s\n"
 "  FileSet:                %s\n"
@@ -5436,95 +5693,98 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/verify.c:525
+#: src/dird/verify.c:531
 #, c-format
 msgid ""
 "bird<filed: bad attributes, expected 3 fields got %d\n"
 " mslen=%d msg=%s\n"
 msgstr ""
 
-#: src/dird/verify.c:569
+#: src/dird/verify.c:575
 #, c-format
 msgid "New file: %s\n"
 msgstr ""
 
-#: src/dird/verify.c:570
+#: src/dird/verify.c:576
 #, c-format
 msgid "File not in catalog: %s\n"
 msgstr ""
 
-#: src/dird/verify.c:594
+#: src/dird/verify.c:600
 #, c-format
 msgid "      st_ino   differ. Cat: %s File: %s\n"
 msgstr ""
 
-#: src/dird/verify.c:603
+#: src/dird/verify.c:609
 #, c-format
 msgid "      st_mode  differ. Cat: %x File: %x\n"
 msgstr ""
 
-#: src/dird/verify.c:611
+#: src/dird/verify.c:617
 #, c-format
 msgid "      st_nlink differ. Cat: %d File: %d\n"
 msgstr ""
 
-#: src/dird/verify.c:619
+#: src/dird/verify.c:625
 #, c-format
 msgid "      st_uid   differ. Cat: %u File: %u\n"
 msgstr ""
 
-#: src/dird/verify.c:627
+#: src/dird/verify.c:633
 #, c-format
 msgid "      st_gid   differ. Cat: %u File: %u\n"
 msgstr ""
 
-#: src/dird/verify.c:635
+#: src/dird/verify.c:641
 #, c-format
 msgid "      st_size  differ. Cat: %s File: %s\n"
 msgstr ""
 
-#: src/dird/verify.c:644
+#: src/dird/verify.c:650
 msgid "      st_atime differs\n"
 msgstr ""
 
-#: src/dird/verify.c:651
+#: src/dird/verify.c:657
 msgid "      st_mtime differs\n"
 msgstr ""
 
-#: src/dird/verify.c:658
+#: src/dird/verify.c:664
 msgid "      st_ctime differs\n"
 msgstr ""
 
-#: src/dird/verify.c:665
+#: src/dird/verify.c:671
 #, c-format
 msgid "      st_size  decrease. Cat: %s File: %s\n"
 msgstr ""
 
-#: src/dird/verify.c:695
+#: src/dird/verify.c:701
 #, c-format
 msgid "MD5/SHA1 index %d not same as attributes %d\n"
 msgstr ""
 
-#: src/dird/verify.c:704
+#: src/dird/verify.c:710
 #, c-format
 msgid "      %s not same. File=%s Cat=%s\n"
 msgstr ""
 
-#: src/dird/verify.c:707
+#: src/dird/verify.c:713
 #, c-format
 msgid "      %s differs.\n"
 msgstr ""
 
-#: src/dird/verify.c:719
+#: src/dird/verify.c:725
 #, c-format
 msgid "bdird<filed: bad attributes from filed n=%d : %s\n"
 msgstr ""
 
-#: src/dird/verify.c:759
-msgid "The following files are missing:\n"
+#: src/dird/verify.c:764
+#, c-format
+msgid ""
+"\n"
+"The following files are in the Catalog but not on %s:\n"
 msgstr ""
 
-#: src/dird/verify.c:773 src/tools/testfind.c:407
+#: src/dird/verify.c:779 src/tools/testfind.c:407
 #, c-format
 msgid "File: %s\n"
 msgstr ""
@@ -5554,208 +5814,250 @@ msgid ""
 "help.\n"
 msgstr ""
 
-#: src/console/console.c:113
+#: src/console/console.c:114
 #, c-format
 msgid ""
 "\n"
 "Version: "
 msgstr ""
 
-#: src/console/console.c:161
-msgid "input from file"
+#: src/console/console.c:114
+#, c-format
+msgid ""
+") %s %s %s\n"
+"\n"
+"Usage: bconsole [-s] [-c config_file] [-d debug_level]\n"
+"       -c <file>   set configuration file to file\n"
+"       -dnn        set debug level to nn\n"
+"       -n          no conio\n"
+"       -s          no signals\n"
+"       -t          test - read configuration and exit\n"
+"       -?          print this message.\n"
+"\n"
 msgstr ""
 
 #: src/console/console.c:162
+msgid "input from file"
+msgstr ""
+
+#: src/console/console.c:163
 msgid "output to file"
 msgstr ""
 
-#: src/console/console.c:164
+#: src/console/console.c:165
 msgid "output to file and terminal"
 msgstr ""
 
-#: src/console/console.c:165
+#: src/console/console.c:166
 msgid "sleep specified time"
 msgstr ""
 
-#: src/console/console.c:167
+#: src/console/console.c:168
 msgid "print Console's version"
 msgstr ""
 
-#: src/console/console.c:168
+#: src/console/console.c:169
 msgid "echo command string"
 msgstr ""
 
 #: src/console/console.c:170
+msgid "execute an external command"
+msgstr ""
+
+#: src/console/console.c:172
 msgid "zed_keys = use zed keys instead of bash keys"
 msgstr ""
 
-#: src/console/console.c:459
+#: src/console/console.c:205
+msgid ": is an invalid command\n"
+msgstr ""
+
+#: src/console/console.c:462
 msgid "Available Directors:\n"
 msgstr ""
 
-#: src/console/console.c:463
+#: src/console/console.c:466
 #, c-format
-msgid "%d  %s at %s:%d\n"
+msgid "%2d:  %s at %s:%d\n"
+msgstr ""
+
+#: src/console/console.c:470
+msgid "Select Director by entering a number: "
 msgstr ""
 
-#: src/console/console.c:467
-msgid "Select Director: "
+#: src/console/console.c:475
+#, c-format
+msgid "%s is not a number. You must enter a number between 1 and %d\n"
 msgstr ""
 
-#: src/console/console.c:473
+#: src/console/console.c:481
 #, c-format
 msgid "You must enter a number between 1 and %d\n"
 msgstr ""
 
-#: src/console/console.c:513 src/tray-monitor/tray-monitor.c:872
+#: src/console/console.c:521 src/tray-monitor/tray-monitor.c:905
 #, c-format
 msgid "Connecting to Director %s:%d\n"
 msgstr ""
 
-#: src/console/console.c:529 src/gnome2-console/console.c:526
+#: src/console/console.c:538 src/gnome2-console/console.c:526
 #: src/wx-console/console_thread.cpp:391
 #, c-format
 msgid "Failed to initialize TLS context for Console \"%s\".\n"
 msgstr ""
 
-#: src/console/console.c:549 src/gnome2-console/console.c:548
+#: src/console/console.c:558 src/gnome2-console/console.c:548
 #: src/wx-console/console_thread.cpp:412
 #, c-format
 msgid "Failed to initialize TLS context for Director \"%s\".\n"
 msgstr ""
 
-#: src/console/console.c:572
+#: src/console/console.c:588
 msgid "Enter a period to cancel a command.\n"
 msgstr ""
 
-#: src/console/console.c:648 src/gnome2-console/console.c:160
+#: src/console/console.c:664 src/gnome2-console/console.c:160
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Director \"%s\" in %s. At least one CA certificate store is required.\n"
 msgstr ""
 
-#: src/console/console.c:657 src/gnome2-console/console.c:169
+#: src/console/console.c:673 src/gnome2-console/console.c:169
 #, c-format
 msgid ""
 "No Director resource defined in %s\n"
 "Without that I don't how to speak to the Director :-(\n"
 msgstr ""
 
-#: src/console/console.c:677 src/gnome2-console/console.c:189
+#: src/console/console.c:693 src/gnome2-console/console.c:189
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Console \"%s\" in %s.\n"
 msgstr ""
 
-#: src/console/console.c:833
+#: src/console/console.c:849
 msgid "Too many arguments on input command.\n"
 msgstr ""
 
-#: src/console/console.c:837
+#: src/console/console.c:853
 msgid "First argument to input command must be a filename.\n"
 msgstr ""
 
-#: src/console/console.c:842
+#: src/console/console.c:858
 #, c-format
 msgid "Cannot open file %s for input. ERR=%s\n"
 msgstr ""
 
-#: src/console/console.c:872
+#: src/console/console.c:888
 msgid "Too many arguments on output/tee command.\n"
 msgstr ""
 
-#: src/console/console.c:888
+#: src/console/console.c:905
 #, c-format
 msgid "Cannot open file %s for output. ERR=%s\n"
 msgstr ""
 
-#: src/console/console_conf.c:136 src/gnome2-console/console_conf.c:135
+#: src/console/console.c:924
+msgid "Too many arguments. Enclose command in double quotes.\n"
+msgstr ""
+
+#: src/console/console.c:933
+#, c-format
+msgid "Cannot popen(\"%s\", \"r\"): ERR=%s\n"
+msgstr ""
+
+#: src/console/console.c:945 src/stored/autochanger.c:549
+#, c-format
+msgid "Autochanger error: ERR=%s\n"
+msgstr ""
+
+#: src/console/console_conf.c:138 src/gnome2-console/console_conf.c:134
 #: src/wx-console/console_conf.c:147
 #, c-format
 msgid "No record for %d %s\n"
 msgstr ""
 
-#: src/console/console_conf.c:145 src/wx-console/console_conf.c:156
+#: src/console/console_conf.c:147 src/wx-console/console_conf.c:156
 #, c-format
 msgid "Console: name=%s rcfile=%s histfile=%s\n"
 msgstr ""
 
-#: src/console/console_conf.c:149 src/gnome2-console/console_conf.c:144
+#: src/console/console_conf.c:151 src/gnome2-console/console_conf.c:143
 #: src/wx-console/console_conf.c:160
 #, c-format
 msgid "Director: name=%s address=%s DIRport=%d\n"
 msgstr ""
 
-#: src/console/console_conf.c:153 src/console/console_conf.c:229
-#: src/console/console_conf.c:274 src/console/console_conf.c:301
+#: src/console/console_conf.c:155 src/console/console_conf.c:231
+#: src/console/console_conf.c:276 src/console/console_conf.c:303
 #: src/filed/filed_conf.c:319 src/filed/filed_conf.c:384
-#: src/filed/filed_conf.c:414 src/gnome2-console/console_conf.c:155
-#: src/gnome2-console/console_conf.c:233 src/gnome2-console/console_conf.c:281
-#: src/gnome2-console/console_conf.c:311 src/stored/stored_conf.c:527
-#: src/stored/stored_conf.c:615 src/stored/stored_conf.c:650
+#: src/filed/filed_conf.c:414 src/gnome2-console/console_conf.c:154
+#: src/gnome2-console/console_conf.c:232 src/gnome2-console/console_conf.c:280
+#: src/gnome2-console/console_conf.c:310 src/stored/stored_conf.c:528
+#: src/stored/stored_conf.c:616 src/stored/stored_conf.c:651
 #: src/wx-console/console_conf.c:164 src/wx-console/console_conf.c:239
 #: src/wx-console/console_conf.c:284 src/wx-console/console_conf.c:311
 #, c-format
 msgid "Unknown resource type %d\n"
 msgstr ""
 
-#: src/filed/acl.c:103 src/filed/acl.c:109
+#: src/filed/acl.c:104 src/filed/acl.c:110
 msgid "ACL support not configured for your machine.\n"
 msgstr ""
 
-#: src/filed/acl.c:185
+#: src/filed/acl.c:186
 #, c-format
 msgid "acl_to_text error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:214
+#: src/filed/acl.c:215
 #, c-format
 msgid "acl_delete_def_file error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:222
+#: src/filed/acl.c:223
 #, c-format
 msgid "acl_from_text error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:236
+#: src/filed/acl.c:237
 #, c-format
 msgid "ac_valid error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:251
+#: src/filed/acl.c:252
 #, c-format
 msgid "acl_set_file error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:285
+#: src/filed/acl.c:286
 #, c-format
 msgid "acltostr error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:302 src/filed/acl.c:310
+#: src/filed/acl.c:303 src/filed/acl.c:311
 #, c-format
 msgid "strtoacl error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:322
+#: src/filed/acl.c:323
 #, c-format
 msgid "setacl error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:358
+#: src/filed/acl.c:359
 #, c-format
 msgid "acltotext error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:375
+#: src/filed/acl.c:376
 #, c-format
 msgid "aclfromtext error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:387
+#: src/filed/acl.c:388
 #, c-format
 msgid "acl(SETACL) error on file \"%s\": ERR=%s\n"
 msgstr ""
@@ -5791,7 +6093,7 @@ msgid ""
 "support.\n"
 msgstr ""
 
-#: src/filed/authenticate.c:193 src/stored/dircmd.c:196
+#: src/filed/authenticate.c:193 src/stored/dircmd.c:199
 msgid "Unable to authenticate Director\n"
 msgstr ""
 
@@ -5802,159 +6104,163 @@ msgid ""
 "help.\n"
 msgstr ""
 
-#: src/filed/backup.c:84
+#: src/filed/backup.c:86
 msgid "Cannot set buffer size FD->SD.\n"
 msgstr ""
 
-#: src/filed/backup.c:127 src/filed/backup.c:139
-msgid "An error occured while encrypting the stream.\n"
+#: src/filed/backup.c:129 src/filed/backup.c:138
+msgid "An error occurred while encrypting the stream.\n"
 msgstr ""
 
-#: src/filed/backup.c:253
+#: src/filed/backup.c:255
 #, c-format
 msgid "     Recursion turned off. Will not descend from %s into %s\n"
 msgstr ""
 
-#: src/filed/backup.c:260
+#: src/filed/backup.c:262
 #, c-format
 msgid "     %s is a different filesystem. Will not descend from %s into %s\n"
 msgstr ""
 
-#: src/filed/backup.c:266
+#: src/filed/backup.c:268
 #, c-format
 msgid "     Disallowed filesystem. Will not descend from %s into %s\n"
 msgstr ""
 
-#: src/filed/backup.c:271
+#: src/filed/backup.c:273
 #, c-format
 msgid "     Disallowed drive type. Will not descend into %s\n"
 msgstr ""
 
-#: src/filed/backup.c:289 src/filed/verify.c:121
+#: src/filed/backup.c:292 src/filed/verify.c:123
 #, c-format
 msgid "     Could not access %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/backup.c:296 src/filed/verify.c:128
+#: src/filed/backup.c:299 src/filed/verify.c:130
 #, c-format
 msgid "     Could not follow link %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/backup.c:303 src/filed/verify.c:135
+#: src/filed/backup.c:306 src/filed/verify.c:137
 #, c-format
 msgid "     Could not stat %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/backup.c:310 src/filed/verify.c:141
+#: src/filed/backup.c:313 src/filed/verify.c:143
 #, c-format
 msgid "     Unchanged file skipped: %s\n"
 msgstr ""
 
-#: src/filed/backup.c:313
+#: src/filed/backup.c:316
 #, c-format
 msgid "     Archive file not saved: %s\n"
 msgstr ""
 
-#: src/filed/backup.c:317 src/filed/verify.c:155
+#: src/filed/backup.c:320 src/filed/verify.c:158
 #, c-format
 msgid "     Could not open directory %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/backup.c:323
+#: src/filed/backup.c:326
 #, c-format
 msgid "     Unknown file type %d; not saved: %s\n"
 msgstr ""
 
-#: src/filed/backup.c:355 src/filed/verify.c:236
+#: src/filed/backup.c:366 src/filed/verify.c:239
 #, c-format
 msgid "%s digest initialization failed\n"
 msgstr ""
 
-#: src/filed/backup.c:369
+#: src/filed/backup.c:380
 #, c-format
 msgid "%s signature digest initialization failed\n"
 msgstr ""
 
-#: src/filed/backup.c:389
+#: src/filed/backup.c:400
 #, c-format
 msgid "Python reader program \"%s\" not found.\n"
 msgstr ""
 
-#: src/filed/backup.c:420 src/filed/verify.c:293
+#: src/filed/backup.c:462 src/filed/verify.c:300
 #, c-format
 msgid "     Cannot open %s: ERR=%s.\n"
 msgstr ""
 
-#: src/filed/backup.c:470 src/filed/verify.c:307
+#: src/filed/backup.c:499 src/filed/verify.c:314
 #, c-format
 msgid "     Cannot open resource fork for %s: ERR=%s.\n"
 msgstr ""
 
-#: src/filed/backup.c:529
-msgid "Failed to allocate memory for stream signature.\n"
+#: src/filed/backup.c:556
+msgid "Failed to allocate memory for crypto signature.\n"
+msgstr ""
+
+#: src/filed/backup.c:561 src/filed/backup.c:567 src/filed/backup.c:582
+msgid "An error occurred while signing the stream.\n"
 msgstr ""
 
-#: src/filed/backup.c:534 src/filed/backup.c:540 src/filed/backup.c:553
-msgid "An error occured while signing the stream.\n"
+#: src/filed/backup.c:606
+msgid "An error occurred finalizing signing the stream.\n"
 msgstr ""
 
-#: src/filed/backup.c:661
+#: src/filed/backup.c:693
 #, c-format
 msgid "Compression deflateParams error: %d\n"
 msgstr ""
 
-#: src/filed/backup.c:673
+#: src/filed/backup.c:705
 msgid "Encrypting sparse data not supported.\n"
 msgstr ""
 
-#: src/filed/backup.c:680
+#: src/filed/backup.c:712
 msgid "Failed to initialize encryption context.\n"
 msgstr ""
 
-#: src/filed/backup.c:703 src/filed/backup.c:859 src/filed/backup.c:894
-#: src/filed/backup.c:905 src/filed/backup.c:951 src/filed/backup.c:964
-#: src/filed/backup.c:972 src/filed/backup.c:1017 src/filed/backup.c:1051
+#: src/filed/backup.c:735 src/filed/backup.c:891 src/filed/backup.c:926
+#: src/filed/backup.c:937 src/filed/backup.c:983 src/filed/backup.c:996
+#: src/filed/backup.c:1004 src/filed/backup.c:1050 src/filed/backup.c:1086
 #, c-format
 msgid "Network send error to SD. ERR=%s\n"
 msgstr ""
 
-#: src/filed/backup.c:782
+#: src/filed/backup.c:814
 #, c-format
 msgid "Compression deflate error: %d\n"
 msgstr ""
 
-#: src/filed/backup.c:789
+#: src/filed/backup.c:821
 #, c-format
 msgid "Compression deflateReset error: %d\n"
 msgstr ""
 
-#: src/filed/backup.c:832 src/filed/backup.c:848
+#: src/filed/backup.c:864 src/filed/backup.c:880
 msgid "Encryption error\n"
 msgstr ""
 
-#: src/filed/backup.c:872
+#: src/filed/backup.c:904
 #, c-format
 msgid "Read error on file %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/backup.c:875
+#: src/filed/backup.c:907
 msgid "Too many errors.\n"
 msgstr ""
 
-#: src/filed/backup.c:885
+#: src/filed/backup.c:917
 msgid "Encryption padding error\n"
 msgstr ""
 
-#: src/filed/backup.c:942
+#: src/filed/backup.c:974
 #, c-format
 msgid "Error reading ACL of %s\n"
 msgstr ""
 
-#: src/filed/backup.c:996
+#: src/filed/backup.c:1029
 msgid "Invalid file flags, no supported data stream type.\n"
 msgstr ""
 
-#: src/filed/filed.c:64
+#: src/filed/filed.c:65
 #, c-format
 msgid ""
 "\n"
@@ -5973,293 +6279,298 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/filed/filed.c:266
+#: src/filed/filed.c:268
 #, c-format
 msgid ""
 "No File daemon resource defined in %s\n"
 "Without that I don't know who I am :-(\n"
 msgstr ""
 
-#: src/filed/filed.c:271
+#: src/filed/filed.c:273
 #, c-format
 msgid "Only one Client resource permitted in %s\n"
 msgstr ""
 
-#: src/filed/filed.c:294
+#: src/filed/filed.c:296
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "File daemon in %s.\n"
 msgstr ""
 
-#: src/filed/filed.c:318
+#: src/filed/filed.c:320
 msgid "PKI encryption/signing enabled but not compiled into Bacula.\n"
 msgstr ""
 
-#: src/filed/filed.c:329
+#: src/filed/filed.c:331
 #, c-format
 msgid ""
 "\"PKI Key Pair\" must be defined for File daemon \"%s\" in %s if either "
 "\"PKI Sign\" or \"PKI Encrypt\" are enabled.\n"
 msgstr ""
 
-#: src/filed/filed.c:341 src/filed/filed.c:372 src/filed/filed.c:413
+#: src/filed/filed.c:343 src/filed/filed.c:374 src/filed/filed.c:415
 msgid "Failed to allocate a new keypair object.\n"
 msgstr ""
 
-#: src/filed/filed.c:345
+#: src/filed/filed.c:347
 #, c-format
 msgid "Failed to load public certificate for File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/filed/filed.c:351
+#: src/filed/filed.c:353
 #, c-format
 msgid "Failed to load private key for File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/filed/filed.c:381
+#: src/filed/filed.c:383
 #, c-format
 msgid "Failed to load private key from file %s for File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/filed/filed.c:388
+#: src/filed/filed.c:390
 #, c-format
 msgid ""
 "Failed to load trusted signer certificate from file %s for File daemon \"%s"
 "\" in %s.\n"
 msgstr ""
 
-#: src/filed/filed.c:419
+#: src/filed/filed.c:421
 #, c-format
 msgid ""
 "Failed to load master key certificate from file %s for File daemon \"%s\" in "
 "%s.\n"
 msgstr ""
 
-#: src/filed/filed.c:435
+#: src/filed/filed.c:437
 #, c-format
 msgid "No Director resource defined in %s\n"
 msgstr ""
 
-#: src/filed/job.c:357
+#: src/filed/job.c:373
 #, c-format
 msgid "2901 Job %s not found.\n"
 msgstr ""
 
-#: src/filed/job.c:366
+#: src/filed/job.c:382
 #, c-format
 msgid "2001 Job %s marked to be canceled.\n"
 msgstr ""
 
-#: src/filed/job.c:369
+#: src/filed/job.c:385
 msgid "2902 Error scanning cancel command.\n"
 msgstr ""
 
-#: src/filed/job.c:388
+#: src/filed/job.c:404
 #, c-format
 msgid "2991 Bad setdebug command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:404
+#: src/filed/job.c:420
 #, c-format
 msgid "Bad estimate command: %s"
 msgstr ""
 
-#: src/filed/job.c:405
+#: src/filed/job.c:421
 msgid "2992 Bad estimate command.\n"
 msgstr ""
 
-#: src/filed/job.c:428
+#: src/filed/job.c:444
 #, c-format
 msgid "Bad Job Command: %s"
 msgstr ""
 
-#: src/filed/job.c:449
+#: src/filed/job.c:465
 #, c-format
 msgid "Bad RunBeforeJob command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:450 src/filed/job.c:468
+#: src/filed/job.c:466 src/filed/job.c:484
 msgid "2905 Bad RunBeforeJob command.\n"
 msgstr ""
 
-#: src/filed/job.c:479
+#: src/filed/job.c:495
 msgid "2905 Bad RunBeforeNow command.\n"
 msgstr ""
 
-#: src/filed/job.c:494
+#: src/filed/job.c:514
 #, c-format
 msgid "Bad RunAfter command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:495
+#: src/filed/job.c:515
 msgid "2905 Bad RunAfterJob command.\n"
 msgstr ""
 
-#: src/filed/job.c:527
+#: src/filed/job.c:549
 #, c-format
 msgid "Bad RunScript command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:528
+#: src/filed/job.c:550
 msgid "2905 Bad RunScript command.\n"
 msgstr ""
 
-#: src/filed/job.c:627
+#: src/filed/job.c:652
 #, c-format
 msgid "Error running program: %s. stat=%d: ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:637
+#: src/filed/job.c:662
 #, c-format
 msgid "Cannot open FileSet input file: %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:731
+#: src/filed/job.c:758
 #, c-format
 msgid "REGEX %s compile error. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:793
+#: src/filed/job.c:820
 #, c-format
 msgid "Invalid FileSet command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1008 src/findlib/match.c:199 src/tools/testfind.c:635
+#: src/filed/job.c:1054 src/findlib/match.c:199 src/tools/testfind.c:635
 #, c-format
 msgid "Unknown include/exclude option: %c\n"
 msgstr ""
 
-#: src/filed/job.c:1077 src/stored/fd_cmds.c:348
+#: src/filed/job.c:1123 src/stored/fd_cmds.c:355
 #, c-format
 msgid "Could not create bootstrap file %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1179
+#: src/filed/job.c:1232
 #, c-format
 msgid "DIR and FD clocks differ by %d seconds, FD automatically adjusting.\n"
 msgstr ""
 
-#: src/filed/job.c:1187
+#: src/filed/job.c:1240
 #, c-format
 msgid "Unknown backup level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1199
+#: src/filed/job.c:1252
 #, c-format
 msgid "Bad level command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1220
+#: src/filed/job.c:1273
 #, c-format
 msgid "Bad session command: %s"
 msgstr ""
 
-#: src/filed/job.c:1241
+#: src/filed/job.c:1294
 #, c-format
 msgid "Bad storage command: %s"
 msgstr ""
 
-#: src/filed/job.c:1250
+#: src/filed/job.c:1303
 #, c-format
 msgid "Failed to connect to Storage daemon: %s:%d\n"
 msgstr ""
 
-#: src/filed/job.c:1262
+#: src/filed/job.c:1315
 msgid "Failed to authenticate Storage daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1300
+#: src/filed/job.c:1353
 msgid "Cannot contact Storage daemon\n"
 msgstr ""
 
-#: src/filed/job.c:1318
+#: src/filed/job.c:1371
 #, c-format
 msgid "Bad response to append open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1323
+#: src/filed/job.c:1376
 msgid "Bad response from stored to open command\n"
 msgstr ""
 
-#: src/filed/job.c:1350
+#: src/filed/job.c:1403
 #, c-format
 msgid "Generate VSS snapshots. Driver=\"%s\", Drive(s)=\"%s\"\n"
 msgstr ""
 
-#: src/filed/job.c:1352
+#: src/filed/job.c:1405
 msgid "Generate VSS snapshots failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1359
+#: src/filed/job.c:1412
 #, c-format
 msgid ""
 "Generate VSS snapshot of drive \"%c:\\\" failed. VSS support is disabled on "
 "this drive.\n"
 msgstr ""
 
-#: src/filed/job.c:1366
+#: src/filed/job.c:1419
 #, c-format
 msgid "VSS Writer (PrepareForBackup): %s\n"
 msgstr ""
 
-#: src/filed/job.c:1371
+#: src/filed/job.c:1424
 msgid "No drive letters found for generating VSS snapshots.\n"
 msgstr ""
 
-#: src/filed/job.c:1375
+#: src/filed/job.c:1428
 #, c-format
 msgid "VSS was not initialized properly. VSS support is disabled. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1433
+#: src/filed/job.c:1478
 msgid "Append Close with SD failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1437
+#: src/filed/job.c:1482
 #, c-format
 msgid "Bad status %d returned from Storage Daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1455
+#: src/filed/job.c:1500
 #, c-format
 msgid "VSS Writer (BackupComplete): %s\n"
 msgstr ""
 
-#: src/filed/job.c:1483
+#: src/filed/job.c:1528
 #, c-format
 msgid "2994 Bad verify command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1498 src/filed/job.c:1537
+#: src/filed/job.c:1543 src/filed/job.c:1582
 #, c-format
 msgid "2994 Bad verify level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1579
+#: src/filed/job.c:1626
 #, c-format
 msgid "Bad replace command. CMD=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1658
+#: src/filed/job.c:1644
+#, c-format
+msgid "Bad where regexp. where=%s\n"
+msgstr ""
+
+#: src/filed/job.c:1718
 msgid "Improper calling sequence.\n"
 msgstr ""
 
-#: src/filed/job.c:1678
+#: src/filed/job.c:1738
 #, c-format
 msgid "Bad response to SD read open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1683
+#: src/filed/job.c:1743
 msgid "Bad response from stored to read open command\n"
 msgstr ""
 
-#: src/filed/job.c:1747
+#: src/filed/job.c:1807
 #, c-format
 msgid "Comm error with SD. bad response to %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1750
+#: src/filed/job.c:1810
 #, c-format
 msgid "Bad response to %s command. Wanted %s, got %s\n"
 msgstr ""
@@ -6274,331 +6585,351 @@ msgstr ""
 msgid "Cannot find attribute %s"
 msgstr ""
 
-#: src/filed/restore.c:89
+#: src/filed/restore.c:133
 #, c-format
 msgid "Size of data or stream of %s not correct. Original %s, restored %s.\n"
 msgstr ""
 
-#: src/filed/restore.c:166
-msgid "Open File Manager paused\n"
-msgstr ""
-
-#: src/filed/restore.c:170
-msgid "FAILED to pause Open File Manager\n"
-msgstr ""
-
-#: src/filed/restore.c:178
-#, c-format
-msgid "Running as '%s'. Privmask=%#08x\n"
-msgstr ""
-
-#: src/filed/restore.c:180
-msgid "Failed to retrieve current UserName\n"
-msgstr ""
-
-#: src/filed/restore.c:244 src/filed/verify_vol.c:99
+#: src/filed/restore.c:255 src/filed/verify_vol.c:99
 #, c-format
 msgid "Record header scan error: %s\n"
 msgstr ""
 
-#: src/filed/restore.c:252 src/filed/verify_vol.c:108
+#: src/filed/restore.c:263 src/filed/verify_vol.c:108
 #, c-format
 msgid "Data record error. ERR=%s\n"
 msgstr ""
 
-#: src/filed/restore.c:256 src/filed/verify_vol.c:112
+#: src/filed/restore.c:267 src/filed/verify_vol.c:112
 #, c-format
 msgid "Actual data size %d not same as header %d\n"
 msgstr ""
 
-#: src/filed/restore.c:286 src/filed/restore.c:603
+#: src/filed/restore.c:294 src/filed/restore.c:639
 msgid "Logic error: output file should be open\n"
 msgstr ""
 
-#: src/filed/restore.c:310 src/filed/restore.c:627 src/filed/restore.c:672
-#, c-format
-msgid "Missing cryptographic signature for %s\n"
-msgstr ""
-
-#: src/filed/restore.c:325 src/filed/restore.c:633
+#: src/filed/restore.c:315 src/filed/restore.c:652
 msgid "Logic error: output file should not be open\n"
 msgstr ""
 
-#: src/filed/restore.c:336 src/filed/verify_vol.c:151
-#: src/stored/bextract.c:302 src/stored/bls.c:383 src/stored/bscan.c:659
+#: src/filed/restore.c:326 src/filed/verify_vol.c:151
+#: src/stored/bextract.c:302 src/stored/bls.c:383 src/stored/bscan.c:663
 #, c-format
 msgid "Record header file index %ld not equal record index %ld\n"
 msgstr ""
 
-#: src/filed/restore.c:349 src/stored/bextract.c:311
+#: src/filed/restore.c:339 src/stored/bextract.c:311
 #, c-format
 msgid "%s stream not supported on this Client.\n"
 msgstr ""
 
-#: src/filed/restore.c:400
+#: src/filed/restore.c:391
+msgid "Unexpected cryptographic session data stream.\n"
+msgstr ""
+
+#: src/filed/restore.c:399
 msgid ""
 "No private decryption keys have been defined to decrypt encrypted backup "
 "data.\n"
 msgstr ""
 
-#: src/filed/restore.c:413
+#: src/filed/restore.c:410
+msgid "Could not create digest.\n"
+msgstr ""
+
+#: src/filed/restore.c:424
 msgid "Missing private key required to decrypt encrypted backup data.\n"
 msgstr ""
 
-#: src/filed/restore.c:416
+#: src/filed/restore.c:427
 msgid "Decrypt of the session key failed.\n"
 msgstr ""
 
-#: src/filed/restore.c:420
+#: src/filed/restore.c:431
+#, c-format
+msgid "An error occurred while decoding encrypted session data stream: %s\n"
+msgstr ""
+
+#: src/filed/restore.c:480 src/filed/restore.c:526
 #, c-format
-msgid "An error occured while decoding encrypted session data stream: %s\n"
+msgid "Missing encryption session data stream for %s\n"
 msgstr ""
 
-#: src/filed/restore.c:432 src/filed/restore.c:503
+#: src/filed/restore.c:488 src/filed/restore.c:533
 #, c-format
 msgid "Failed to initialize decryption context for %s\n"
 msgstr ""
 
-#: src/filed/restore.c:515
+#: src/filed/restore.c:545
 #, c-format
 msgid "     Cannot open resource fork for %s.\n"
 msgstr ""
 
-#: src/filed/restore.c:541
+#: src/filed/restore.c:571
 #, c-format
 msgid "     Invalid length of Finder Info (got %d, not 32)\n"
 msgstr ""
 
-#: src/filed/restore.c:545
+#: src/filed/restore.c:575
 #, c-format
 msgid "     Could not set Finder Info on %s\n"
 msgstr ""
 
-#: src/filed/restore.c:558
+#: src/filed/restore.c:588
 #, c-format
 msgid "Can't restore ACL of %s\n"
 msgstr ""
 
-#: src/filed/restore.c:570
+#: src/filed/restore.c:600
 #, c-format
 msgid "Can't restore default ACL of %s\n"
 msgstr ""
 
-#: src/filed/restore.c:580
+#: src/filed/restore.c:610
+msgid "Unexpected cryptographic signature data stream.\n"
+msgstr ""
+
+#: src/filed/restore.c:616
 #, c-format
 msgid "Failed to decode message signature for %s\n"
 msgstr ""
 
-#: src/filed/restore.c:636 src/stored/bextract.c:469
+#: src/filed/restore.c:655 src/stored/bextract.c:469
 #, c-format
 msgid "Unknown stream=%d ignored. This shouldn't happen!\n"
 msgstr ""
 
-#: src/filed/restore.c:730
+#: src/filed/restore.c:732
 #, c-format
 msgid ""
 "%d non-supported data streams and %d non-supported attrib streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:734
+#: src/filed/restore.c:736
 #, c-format
 msgid "%d non-supported resource fork streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:737
+#: src/filed/restore.c:739
 #, c-format
 msgid "%d non-supported Finder Info streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:740
+#: src/filed/restore.c:742
 #, c-format
 msgid "%d non-supported acl streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:751
+#: src/filed/restore.c:745
+#, c-format
+msgid "%d non-supported crypto streams ignored.\n"
+msgstr ""
+
+#: src/filed/restore.c:757
 msgid "None"
 msgstr ""
 
-#: src/filed/restore.c:755
+#: src/filed/restore.c:761
 msgid "Zlib errno"
 msgstr ""
 
-#: src/filed/restore.c:757
+#: src/filed/restore.c:763
 msgid "Zlib stream error"
 msgstr ""
 
-#: src/filed/restore.c:759
+#: src/filed/restore.c:765
 msgid "Zlib data error"
 msgstr ""
 
-#: src/filed/restore.c:761
+#: src/filed/restore.c:767
 msgid "Zlib memory error"
 msgstr ""
 
-#: src/filed/restore.c:763
+#: src/filed/restore.c:769
 msgid "Zlib buffer error"
 msgstr ""
 
-#: src/filed/restore.c:765
+#: src/filed/restore.c:771
 msgid "Zlib version error"
 msgstr ""
 
-#: src/filed/restore.c:767 src/lib/util.c:591 src/lib/util.c:601
+#: src/filed/restore.c:773 src/lib/util.c:591 src/lib/util.c:601
 #: src/lib/util.c:609 src/lib/util.c:616 src/lib/util.c:623 src/lib/util.c:637
 #: src/lib/util.c:647 src/lib/util.c:654 src/lib/util.c:665
 msgid "*none*"
 msgstr ""
 
-#: src/filed/restore.c:804
+#: src/filed/restore.c:809
+#, c-format
+msgid "Missing cryptographic signature for %s\n"
+msgstr ""
+
+#: src/filed/restore.c:838 src/filed/restore.c:862
+#, c-format
+msgid "Signature validation failed for file %s: ERR=%s\n"
+msgstr ""
+
+#: src/filed/restore.c:852
 #, c-format
-msgid "Signature validation failed for %s: \n"
+msgid "Digest one file failed for file: %s\n"
 msgstr ""
 
-#: src/filed/restore.c:813 src/filed/restore.c:828
+#: src/filed/restore.c:883
 #, c-format
 msgid "Signature validation failed for %s: %s\n"
 msgstr ""
 
-#: src/filed/restore.c:853 src/stored/bextract.c:400
+#: src/filed/restore.c:909 src/stored/bextract.c:400
 #, c-format
 msgid "Seek to %s error on %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/restore.c:880
+#: src/filed/restore.c:936
 #, c-format
 msgid "Uncompression error on file %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/restore.c:889 src/stored/bextract.c:434
+#: src/filed/restore.c:945 src/stored/bextract.c:434
 msgid "GZIP data stream found, but GZIP not configured!\n"
 msgstr ""
 
-#: src/filed/restore.c:909
+#: src/filed/restore.c:968
 #, c-format
 msgid "Write error in Win32 Block Decomposition on %s: %s\n"
 msgstr ""
 
-#: src/filed/restore.c:915 src/stored/bextract.c:372 src/stored/bextract.c:422
+#: src/filed/restore.c:974 src/stored/bextract.c:372 src/stored/bextract.c:422
 #, c-format
 msgid "Write error on %s: %s\n"
 msgstr ""
 
-#: src/filed/restore.c:964
+#: src/filed/restore.c:1023
 msgid "Decryption error\n"
 msgstr ""
 
-#: src/filed/restore.c:1054
+#: src/filed/restore.c:1113
 #, c-format
-msgid "Decryption error for %s\n"
+msgid "Decryption error. buf_len=%d decrypt_len=%d on file %s\n"
+msgstr ""
+
+#: src/filed/restore.c:1217
+msgid "Open File Manager paused\n"
+msgstr ""
+
+#: src/filed/restore.c:1221
+msgid "FAILED to pause Open File Manager\n"
 msgstr ""
 
-#: src/filed/restore.c:1071
+#: src/filed/restore.c:1229
 #, c-format
-msgid ""
-"Unexpected number of bytes remaining at end of file, received %u, expected %"
-"u\n"
+msgid "Running as '%s'. Privmask=%#08x\n"
+msgstr ""
+
+#: src/filed/restore.c:1231
+msgid "Failed to retrieve current UserName\n"
 msgstr ""
 
-#: src/filed/status.c:75
+#: src/filed/status.c:77
 #, c-format
 msgid "%s Version: %s (%s) %s %s %s %s\n"
 msgstr ""
 
-#: src/filed/status.c:79 src/stored/status.c:84
+#: src/filed/status.c:81 src/stored/status.c:86
 #, c-format
 msgid "Daemon started %s, %d Job%s run since started.\n"
 msgstr ""
 
-#: src/filed/status.c:133
+#: src/filed/status.c:136
 #, c-format
 msgid " Sizeof: boffset_t=%d size_t=%d debug=%d trace=%d\n"
 msgstr ""
 
-#: src/filed/status.c:152
+#: src/filed/status.c:155
 #, c-format
 msgid "Director connected at: %s\n"
 msgstr ""
 
-#: src/filed/status.c:154
+#: src/filed/status.c:157
 #, c-format
 msgid "JobId %d Job %s is running.\n"
 msgstr ""
 
-#: src/filed/status.c:157
+#: src/filed/status.c:160
 #, c-format
 msgid "    %s%s Job started: %s\n"
 msgstr ""
 
-#: src/filed/status.c:169 src/stored/status.c:398
+#: src/filed/status.c:172
 #, c-format
-msgid "    Files=%s Bytes=%s Bytes/sec=%s\n"
+msgid "    Files=%s Bytes=%s Bytes/sec=%s Errors=%d\n"
 msgstr ""
 
-#: src/filed/status.c:174
+#: src/filed/status.c:178
 #, c-format
 msgid "    Files Examined=%s\n"
 msgstr ""
 
-#: src/filed/status.c:179
+#: src/filed/status.c:183
 #, c-format
 msgid "    Processing file: %s\n"
 msgstr ""
 
-#: src/filed/status.c:190
+#: src/filed/status.c:194
 msgid "    SDSocket closed.\n"
 msgstr ""
 
-#: src/filed/status.c:326 src/filed/status.c:350 src/stored/status.c:610
-#: src/stored/status.c:633
+#: src/filed/status.c:328 src/filed/status.c:352 src/stored/status.c:636
+#: src/stored/status.c:659
 #, c-format
 msgid "Bad .status command: %s\n"
 msgstr ""
 
-#: src/filed/status.c:327
+#: src/filed/status.c:329
 msgid "2900 Bad .status command, missing argument.\n"
 msgstr ""
 
-#: src/filed/status.c:351
+#: src/filed/status.c:353
 msgid "2900 Bad .status command, wrong argument.\n"
 msgstr ""
 
-#: src/filed/status.c:388 src/stored/status.c:551
+#: src/filed/status.c:390 src/stored/status.c:577
 msgid "Init Catalog"
 msgstr ""
 
-#: src/filed/status.c:391 src/stored/status.c:554
+#: src/filed/status.c:393 src/stored/status.c:580
 msgid "Volume to Catalog"
 msgstr ""
 
-#: src/filed/status.c:394 src/stored/status.c:557
+#: src/filed/status.c:396 src/stored/status.c:583
 msgid "Disk to Catalog"
 msgstr ""
 
-#: src/filed/status.c:397 src/stored/status.c:560
+#: src/filed/status.c:399 src/stored/status.c:586
 msgid "Data"
 msgstr ""
 
-#: src/filed/status.c:403 src/lib/util.c:361 src/stored/status.c:566
+#: src/filed/status.c:405 src/lib/util.c:361 src/stored/status.c:592
 msgid "Unknown Job Level"
 msgstr ""
 
-#: src/filed/status.c:419
+#: src/filed/status.c:421
 msgid "Bacula Client: Idle"
 msgstr ""
 
-#: src/filed/status.c:430
+#: src/filed/status.c:432
 msgid "Bacula Client: Running"
 msgstr ""
 
-#: src/filed/status.c:444
+#: src/filed/status.c:446
 msgid "Bacula Client: Last Job Canceled"
 msgstr ""
 
-#: src/filed/status.c:448
+#: src/filed/status.c:450
 msgid "Bacula Client: Last Job Failed"
 msgstr ""
 
-#: src/filed/status.c:452
+#: src/filed/status.c:454
 msgid "Bacula Client: Last Job had Warnings"
 msgstr ""
 
@@ -6607,32 +6938,32 @@ msgstr ""
 msgid "Cannot malloc %d network read buffer\n"
 msgstr ""
 
-#: src/filed/verify.c:144
+#: src/filed/verify.c:146
 #, c-format
 msgid "     Archive file skipped: %s\n"
 msgstr ""
 
-#: src/filed/verify.c:147
+#: src/filed/verify.c:149
 #, c-format
 msgid "     Recursion turned off. Directory skipped: %s\n"
 msgstr ""
 
-#: src/filed/verify.c:150
+#: src/filed/verify.c:153
 #, c-format
 msgid "     File system change prohibited. Directory skipped: %s\n"
 msgstr ""
 
-#: src/filed/verify.c:160
+#: src/filed/verify.c:163
 #, c-format
 msgid "     Unknown file type %d: %s\n"
 msgstr ""
 
-#: src/filed/verify.c:203 src/filed/verify_vol.c:209
+#: src/filed/verify.c:206 src/filed/verify_vol.c:209
 #, c-format
 msgid "Network error in send to Director: ERR=%s\n"
 msgstr ""
 
-#: src/filed/verify.c:343
+#: src/filed/verify.c:352
 #, c-format
 msgid "Error reading file %s: ERR=%s\n"
 msgstr ""
@@ -6646,191 +6977,213 @@ msgstr ""
 msgid "Error scanning record header: %s\n"
 msgstr ""
 
-#: src/findlib/attribs.c:407
+#: src/findlib/attribs.c:408
 #, c-format
 msgid "File size of restored file %s not correct. Original %s, restored %s.\n"
 msgstr ""
 
-#: src/findlib/attribs.c:425 src/findlib/attribs.c:432
+#: src/findlib/attribs.c:434 src/findlib/attribs.c:441
 #, c-format
 msgid "Unable to set file owner %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/attribs.c:438
+#: src/findlib/attribs.c:447
 #, c-format
 msgid "Unable to set file modes %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/attribs.c:448
+#: src/findlib/attribs.c:457
 #, c-format
 msgid "Unable to set file times %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/attribs.c:462
+#: src/findlib/attribs.c:471
 #, c-format
 msgid "Unable to set file flags %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/attribs.c:703
+#: src/findlib/attribs.c:714
 #, c-format
 msgid "Error in %s file %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/attribs.c:720
+#: src/findlib/attribs.c:731
 #, c-format
 msgid "Error in %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/bfile.c:77
-msgid "GZIP data"
+#: src/findlib/bfile.c:82
+msgid "Unix attributes"
 msgstr ""
 
-#: src/findlib/bfile.c:79
-msgid "GZIP sparse data"
+#: src/findlib/bfile.c:84
+msgid "File data"
 msgstr ""
 
-#: src/findlib/bfile.c:81
-msgid "Win32 data"
+#: src/findlib/bfile.c:86
+msgid "MD5 digest"
 msgstr ""
 
-#: src/findlib/bfile.c:83
-msgid "Win32 GZIP data"
+#: src/findlib/bfile.c:88
+msgid "GZIP data"
 msgstr ""
 
-#: src/findlib/bfile.c:85
-msgid "File attributes"
+#: src/findlib/bfile.c:90
+msgid "Extended attributes"
 msgstr ""
 
-#: src/findlib/bfile.c:87
-msgid "File data"
+#: src/findlib/bfile.c:92
+msgid "Sparse data"
 msgstr ""
 
-#: src/findlib/bfile.c:89
-msgid "MD5 digest"
+#: src/findlib/bfile.c:94
+msgid "GZIP sparse data"
 msgstr ""
 
-#: src/findlib/bfile.c:91
-msgid "Extended attributes"
+#: src/findlib/bfile.c:96
+msgid "Program names"
 msgstr ""
 
-#: src/findlib/bfile.c:93
-msgid "Sparse data"
+#: src/findlib/bfile.c:98
+msgid "Program data"
 msgstr ""
 
-#: src/findlib/bfile.c:95
-msgid "Program names"
+#: src/findlib/bfile.c:100
+msgid "SHA1 digest"
 msgstr ""
 
-#: src/findlib/bfile.c:97
-msgid "Program data"
+#: src/findlib/bfile.c:102
+msgid "Win32 data"
 msgstr ""
 
-#: src/findlib/bfile.c:99
-msgid "SHA1 digest"
+#: src/findlib/bfile.c:104
+msgid "Win32 GZIP data"
+msgstr ""
+
+#: src/findlib/bfile.c:106
+msgid "MacOS Fork data"
+msgstr ""
+
+#: src/findlib/bfile.c:108
+msgid "HFS+ attribs"
 msgstr ""
 
-#: src/findlib/bfile.c:101
-msgid "HFS+ resource fork"
+#: src/findlib/bfile.c:110
+msgid "Standard Unix ACL attribs"
 msgstr ""
 
-#: src/findlib/bfile.c:103
-msgid "HFS+ Finder Info"
+#: src/findlib/bfile.c:112
+msgid "Default Unix ACL attribs"
 msgstr ""
 
-#: src/findlib/bfile.c:105
+#: src/findlib/bfile.c:114
 msgid "SHA256 digest"
 msgstr ""
 
-#: src/findlib/bfile.c:107
+#: src/findlib/bfile.c:116
 msgid "SHA512 digest"
 msgstr ""
 
-#: src/findlib/bfile.c:109
+#: src/findlib/bfile.c:118
 msgid "Signed digest"
 msgstr ""
 
-#: src/findlib/bfile.c:111
+#: src/findlib/bfile.c:120
 msgid "Encrypted File data"
 msgstr ""
 
-#: src/findlib/bfile.c:113
-msgid "Encrypted GZIP data"
+#: src/findlib/bfile.c:122
+msgid "Encrypted Win32 data"
 msgstr ""
 
-#: src/findlib/bfile.c:115
-msgid "Encrypted Win32 data"
+#: src/findlib/bfile.c:124
+msgid "Encrypted session data"
+msgstr ""
+
+#: src/findlib/bfile.c:126
+msgid "Encrypted GZIP data"
 msgstr ""
 
-#: src/findlib/bfile.c:117
+#: src/findlib/bfile.c:128
 msgid "Encrypted Win32 GZIP data"
 msgstr ""
 
-#: src/findlib/bfile.c:119
-msgid "Encrypted HFS+ resource fork"
+#: src/findlib/bfile.c:130
+msgid "Encrypted MacOS fork data"
 msgstr ""
 
-#: src/findlib/create_file.c:122
+#: src/findlib/create_file.c:123
 #, c-format
 msgid "File skipped. Not newer: %s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:129
+#: src/findlib/create_file.c:130
 #, c-format
 msgid "File skipped. Not older: %s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:135
+#: src/findlib/create_file.c:136
 #, c-format
 msgid "File skipped. Already exists: %s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:160
+#: src/findlib/create_file.c:162
 #, c-format
 msgid "File %s already exists and could not be replaced. ERR=%s.\n"
 msgstr ""
 
-#: src/findlib/create_file.c:212 src/findlib/create_file.c:261
-#: src/findlib/create_file.c:313
+#: src/findlib/create_file.c:214 src/findlib/create_file.c:277
+#: src/findlib/create_file.c:370
 #, c-format
 msgid "bpkt already open fid=%d\n"
 msgstr ""
 
-#: src/findlib/create_file.c:220
+#: src/findlib/create_file.c:222
 #, c-format
 msgid "Could not create %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:234
+#: src/findlib/create_file.c:236
 #, c-format
 msgid "Cannot make fifo %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:244
+#: src/findlib/create_file.c:254
 #, c-format
 msgid "Cannot make node %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:282
+#: src/findlib/create_file.c:299
 #, c-format
 msgid "Could not symlink %s -> %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:292
+#: src/findlib/create_file.c:324 src/findlib/create_file.c:335
+#, c-format
+msgid "Could not restore file flags for file %s: ERR=%s\n"
+msgstr ""
+
+#: src/findlib/create_file.c:328 src/findlib/create_file.c:343
 #, c-format
 msgid "Could not hard link %s -> %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:345
+#: src/findlib/create_file.c:339
+#, c-format
+msgid "Could not reset file flags for file %s: ERR=%s\n"
+msgstr ""
+
+#: src/findlib/create_file.c:402
 #, c-format
 msgid "Original file %s not saved: type=%d\n"
 msgstr ""
 
-#: src/findlib/create_file.c:348
+#: src/findlib/create_file.c:405
 #, c-format
 msgid "Unknown file type %d; not restored: %s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:392
+#: src/findlib/create_file.c:449
 #, c-format
 msgid "Zero length filename: %s\n"
 msgstr ""
@@ -6839,79 +7192,99 @@ msgstr ""
 msgid "AdjustTokenPrivileges set "
 msgstr ""
 
+#: src/findlib/find_one.c:228
+#, c-format
+msgid "Cannot stat file %s: ERR=%s\n"
+msgstr ""
+
 #: src/findlib/find_one.c:234
 #, c-format
+msgid "%s mtime changed during backup.\n"
+msgstr ""
+
+#: src/findlib/find_one.c:240
+#, c-format
+msgid "%s ctime changed during backup.\n"
+msgstr ""
+
+#: src/findlib/find_one.c:246 src/findlib/find_one.c:253
+#, c-format
+msgid "%s size changed during backup.\n"
+msgstr ""
+
+#: src/findlib/find_one.c:310
+#, c-format
 msgid "Top level directory \"%s\" has unlisted fstype \"%s\"\n"
 msgstr ""
 
-#: src/findlib/find_one.c:249
+#: src/findlib/find_one.c:325
 #, c-format
 msgid "Top level directory \"%s\" has an unlisted drive type \"%s\"\n"
 msgstr ""
 
-#: src/findlib/makepath.c:144
+#: src/findlib/makepath.c:116
 #, c-format
 msgid "Cannot create directory %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/makepath.c:148 src/findlib/makepath.c:426
+#: src/findlib/makepath.c:120 src/findlib/makepath.c:398
 #, c-format
 msgid "%s exists but is not a directory\n"
 msgstr ""
 
-#: src/findlib/makepath.c:257
+#: src/findlib/makepath.c:229
 #, c-format
 msgid "%c: is not a valid drive\n"
 msgstr ""
 
-#: src/findlib/makepath.c:324 src/findlib/makepath.c:385
-#: src/findlib/makepath.c:445
+#: src/findlib/makepath.c:296 src/findlib/makepath.c:357
+#: src/findlib/makepath.c:417
 #, c-format
 msgid "Cannot change owner and/or group of %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/makepath.c:345
+#: src/findlib/makepath.c:317
 #, c-format
 msgid "Cannot chdir to directory, %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/makepath.c:400 src/findlib/makepath.c:416
-#: src/findlib/makepath.c:450
+#: src/findlib/makepath.c:372 src/findlib/makepath.c:388
+#: src/findlib/makepath.c:422
 #, c-format
 msgid "Cannot change permissions of %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/save-cwd.c:77
+#: src/findlib/save-cwd.c:48
 #, c-format
 msgid "Cannot open current directory: %s\n"
 msgstr ""
 
-#: src/findlib/save-cwd.c:91
+#: src/findlib/save-cwd.c:62
 #, c-format
 msgid "Current directory: %s\n"
 msgstr ""
 
-#: src/findlib/save-cwd.c:113
+#: src/findlib/save-cwd.c:84
 #, c-format
 msgid "Cannot get current directory: %s\n"
 msgstr ""
 
-#: src/findlib/save-cwd.c:134
+#: src/findlib/save-cwd.c:105
 #, c-format
 msgid "Cannot return to %s from %s: %s\n"
 msgstr ""
 
-#: src/findlib/save-cwd.c:138
+#: src/findlib/save-cwd.c:109
 #, c-format
 msgid "Cannot return to saved working directory from %s: %s\n"
 msgstr ""
 
-#: src/findlib/save-cwd.c:144
+#: src/findlib/save-cwd.c:115
 #, c-format
 msgid "Cannot return to %s: %s\n"
 msgstr ""
 
-#: src/findlib/save-cwd.c:148
+#: src/findlib/save-cwd.c:119
 #, c-format
 msgid "Cannot return to saved working directory: %s\n"
 msgstr ""
@@ -6946,7 +7319,7 @@ msgid ""
 "\n"
 "Version: %s (%s) %s %s %s\n"
 "\n"
-"Usage: gnome-console [-s] [-c config_file] [-d debug_level] [config_file]\n"
+"Usage: bgnome-console [-s] [-c config_file] [-d debug_level] [config_file]\n"
 "       -c <file>   set configuration file to file\n"
 "       -dnn        set debug level to nn\n"
 "       -s          no signals\n"
@@ -6986,7 +7359,7 @@ msgstr ""
 msgid "Passphrase for Director \"%s\" TLS private key: "
 msgstr ""
 
-#: src/gnome2-console/console.c:557 src/tray-monitor/tray-monitor.c:874
+#: src/gnome2-console/console.c:557 src/tray-monitor/tray-monitor.c:907
 #: src/wx-console/console_thread.cpp:420
 msgid "Director daemon"
 msgstr ""
@@ -7011,12 +7384,12 @@ msgstr ""
 msgid " Ready"
 msgstr ""
 
-#: src/gnome2-console/console_conf.c:148
+#: src/gnome2-console/console_conf.c:147
 #, c-format
 msgid "Console: name=%s\n"
 msgstr ""
 
-#: src/gnome2-console/console_conf.c:151
+#: src/gnome2-console/console_conf.c:150 src/tray-monitor/tray_conf.c:195
 #, c-format
 msgid "ConsoleFont: name=%s font face=%s\n"
 msgstr ""
@@ -7026,7 +7399,7 @@ msgid "Bacula Console"
 msgstr ""
 
 #: src/gnome2-console/interface.c:235 src/wx-console/wxbmainframe.cpp:248
-#: src/wx-console/wxbmainframe.cpp:616
+#: src/wx-console/wxbmainframe.cpp:619
 msgid "Connect"
 msgstr ""
 
@@ -7048,8 +7421,8 @@ msgid "Dir Status"
 msgstr ""
 
 #: src/gnome2-console/interface.c:255 src/lib/util.c:293
-#: src/wx-console/wxbrestorepanel.cpp:403
-#: src/wx-console/wxbrestorepanel.cpp:1972
+#: src/wx-console/wxbrestorepanel.cpp:404
+#: src/wx-console/wxbrestorepanel.cpp:1974
 msgid "Restore"
 msgstr ""
 
@@ -7123,7 +7496,7 @@ msgid " "
 msgstr ""
 
 #: src/gnome2-console/interface.c:765 src/gnome2-console/interface.c:1660
-#: src/wx-console/wxbrestorepanel.cpp:1885
+#: src/wx-console/wxbrestorepanel.cpp:1886
 msgid "Client:"
 msgstr ""
 
@@ -7131,7 +7504,7 @@ msgstr ""
 msgid "FileSet: "
 msgstr ""
 
-#: src/gnome2-console/interface.c:820 src/wx-console/wxbrestorepanel.cpp:1891
+#: src/gnome2-console/interface.c:820 src/wx-console/wxbrestorepanel.cpp:1893
 msgid "Priority:"
 msgstr ""
 
@@ -7158,7 +7531,7 @@ msgid "   "
 msgstr ""
 
 #: src/gnome2-console/interface.c:898 src/gnome2-console/interface.c:1407
-#: src/gnome2-console/interface.c:1748 src/wx-console/wxbrestorepanel.cpp:1887
+#: src/gnome2-console/interface.c:1748 src/wx-console/wxbrestorepanel.cpp:1888
 msgid "Storage:"
 msgstr ""
 
@@ -7170,11 +7543,11 @@ msgstr ""
 msgid "Where: "
 msgstr ""
 
-#: src/gnome2-console/interface.c:979 src/wx-console/wxbrestorepanel.cpp:1889
+#: src/gnome2-console/interface.c:979 src/wx-console/wxbrestorepanel.cpp:1890
 msgid "When:"
 msgstr ""
 
-#: src/gnome2-console/interface.c:999 src/wx-console/wxbrestorepanel.cpp:1870
+#: src/gnome2-console/interface.c:999 src/wx-console/wxbrestorepanel.cpp:1871
 msgid "Bootstrap:"
 msgstr ""
 
@@ -7234,19 +7607,19 @@ msgstr ""
 msgid "Mode"
 msgstr ""
 
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:305
+#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:306
 msgid "User"
 msgstr ""
 
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:309
+#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:310
 msgid "Group"
 msgstr ""
 
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:293
+#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:294
 msgid "Size"
 msgstr ""
 
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:297
+#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:298
 msgid "Date"
 msgstr ""
 
@@ -7280,92 +7653,92 @@ msgstr ""
 msgid "Can't add default address (%s)\n"
 msgstr ""
 
-#: src/lib/address_conf.c:294
+#: src/lib/address_conf.c:293
 msgid "the old style addresses cannot be mixed with new style"
 msgstr ""
 
-#: src/lib/address_conf.c:317
+#: src/lib/address_conf.c:314
 #, c-format
 msgid "can't resolve service(%s)"
 msgstr ""
 
-#: src/lib/address_conf.c:327
+#: src/lib/address_conf.c:323
 #, c-format
 msgid "can't resolve hostname(%s) %s"
 msgstr ""
 
-#: src/lib/address_conf.c:416 src/lib/address_conf.c:447
+#: src/lib/address_conf.c:413 src/lib/address_conf.c:444
 #, c-format
 msgid "Expected a block begin { , got: %s"
 msgstr ""
 
-#: src/lib/address_conf.c:421
+#: src/lib/address_conf.c:418
 msgid "Empty addr block is not allowed"
 msgstr ""
 
-#: src/lib/address_conf.c:425
+#: src/lib/address_conf.c:422
 #, c-format
 msgid "Expected a string, got: %s"
 msgstr ""
 
-#: src/lib/address_conf.c:434
+#: src/lib/address_conf.c:431
 #, c-format
 msgid "Expected a string [ip|ipv4|ipv6], got: %s"
 msgstr ""
 
-#: src/lib/address_conf.c:438
+#: src/lib/address_conf.c:435
 #, c-format
 msgid "Expected a string [ip|ipv4], got: %s"
 msgstr ""
 
-#: src/lib/address_conf.c:443 src/lib/address_conf.c:473
+#: src/lib/address_conf.c:440 src/lib/address_conf.c:470
 #, c-format
 msgid "Expected a equal =, got: %s"
 msgstr ""
 
-#: src/lib/address_conf.c:454 src/lib/address_conf.c:469
+#: src/lib/address_conf.c:451 src/lib/address_conf.c:466
 #, c-format
 msgid "Expected a identifier [addr|port], got: %s"
 msgstr ""
 
-#: src/lib/address_conf.c:459
+#: src/lib/address_conf.c:456
 msgid "Only one port per address block"
 msgstr ""
 
-#: src/lib/address_conf.c:465
+#: src/lib/address_conf.c:462
 msgid "Only one addr per address block"
 msgstr ""
 
-#: src/lib/address_conf.c:481
+#: src/lib/address_conf.c:478
 #, c-format
 msgid "Expected a number or a string, got: %s"
 msgstr ""
 
-#: src/lib/address_conf.c:487 src/lib/address_conf.c:521
+#: src/lib/address_conf.c:484 src/lib/address_conf.c:517
 #, c-format
 msgid "Expected an IP number or a hostname, got: %s"
 msgstr ""
 
-#: src/lib/address_conf.c:493
+#: src/lib/address_conf.c:490
 msgid "State machine missmatch"
 msgstr ""
 
-#: src/lib/address_conf.c:499 src/lib/address_conf.c:512
+#: src/lib/address_conf.c:496 src/lib/address_conf.c:508
 #, c-format
 msgid "Expected a end of block }, got: %s"
 msgstr ""
 
-#: src/lib/address_conf.c:505
+#: src/lib/address_conf.c:502
 #, c-format
 msgid "Can't add hostname(%s) and port(%s) to addrlist (%s)"
 msgstr ""
 
-#: src/lib/address_conf.c:526 src/lib/address_conf.c:540
+#: src/lib/address_conf.c:522 src/lib/address_conf.c:536
 #, c-format
 msgid "can't add port (%s) to (%s)"
 msgstr ""
 
-#: src/lib/address_conf.c:535
+#: src/lib/address_conf.c:531
 #, c-format
 msgid "Expected a port number or string, got: %s"
 msgstr ""
@@ -7403,204 +7776,117 @@ msgstr ""
 
 #: src/lib/bget_msg.c:103
 #, c-format
-msgid "bget_msg: unknown signal %d\n"
-msgstr ""
-
-#: src/lib/bnet.c:122
-#, c-format
-msgid "Attr spool write error. ERR=%s\n"
-msgstr ""
-
-#: src/lib/bnet.c:222 src/lib/bnet.c:279
-#, c-format
-msgid "Read expected %d got %d from %s:%s:%d\n"
-msgstr ""
-
-#: src/lib/bnet.c:240
-#, c-format
-msgid "Packet size too big from \"%s:%s:%d. Terminating connection.\n"
-msgstr ""
-
-#: src/lib/bnet.c:269
-#, c-format
-msgid "Read error from %s:%s:%d: ERR=%s\n"
-msgstr ""
-
-#: src/lib/bnet.c:345 src/lib/bnet.c:361
-#, c-format
-msgid "fread attr spool error. ERR=%s\n"
-msgstr ""
-
-#: src/lib/bnet.c:405
-#, c-format
-msgid "Write error sending len to %s:%s:%d: ERR=%s\n"
-msgstr ""
-
-#: src/lib/bnet.c:410 src/lib/bnet.c:443
-#, c-format
-msgid "Wrote %d bytes to %s:%s:%d, but only %d accepted.\n"
+msgid "bget_msg: unknown signal %d\n"
 msgstr ""
 
-#: src/lib/bnet.c:437
+#: src/lib/bnet.c:118
 #, c-format
-msgid "Write error sending %d bytes to %s:%s:%d: ERR=%s\n"
+msgid "Attr spool write error. ERR=%s\n"
 msgstr ""
 
-#: src/lib/bnet.c:463 src/lib/bnet.c:502
+#: src/lib/bnet.c:244 src/lib/bnet.c:283
 msgid "TLS connection initialization failed.\n"
 msgstr ""
 
-#: src/lib/bnet.c:471
+#: src/lib/bnet.c:252
 msgid "TLS Negotiation failed.\n"
 msgstr ""
 
-#: src/lib/bnet.c:477
+#: src/lib/bnet.c:258 src/lib/bnet.c:298
 msgid ""
 "TLS certificate verification failed. Peer certificate did not match a "
 "required commonName\n"
 msgstr ""
 
-#: src/lib/bnet.c:514
+#: src/lib/bnet.c:305
 #, c-format
 msgid ""
 "TLS host certificate verification failed. Host %s did not match presented "
 "certificate\n"
 msgstr ""
 
-#: src/lib/bnet.c:527
+#: src/lib/bnet.c:322
 msgid "TLS enabled but not configured.\n"
 msgstr ""
 
-#: src/lib/bnet.c:532
+#: src/lib/bnet.c:328
 msgid "TLS enable but not configured.\n"
 msgstr ""
 
-#: src/lib/bnet.c:628
+#: src/lib/bnet.c:386
 msgid "No problem."
 msgstr ""
 
-#: src/lib/bnet.c:631
+#: src/lib/bnet.c:389
 msgid "Authoritative answer for host not found."
 msgstr ""
 
-#: src/lib/bnet.c:634
+#: src/lib/bnet.c:392
 msgid "Non-authoritative for host not found, or ServerFail."
 msgstr ""
 
-#: src/lib/bnet.c:637
+#: src/lib/bnet.c:395
 msgid "Non-recoverable errors, FORMERR, REFUSED, or NOTIMP."
 msgstr ""
 
-#: src/lib/bnet.c:640
+#: src/lib/bnet.c:398
 msgid "Valid name, no data record of resquested type."
 msgstr ""
 
-#: src/lib/bnet.c:643
+#: src/lib/bnet.c:401
 msgid "Unknown error."
 msgstr ""
 
-#: src/lib/bnet.c:778
-#, c-format
-msgid "gethostbyname() for host \"%s\" failed: ERR=%s\n"
-msgstr ""
-
-#: src/lib/bnet.c:798
-#, c-format
-msgid "Socket open error. proto=%d port=%d. ERR=%s\n"
-msgstr ""
-
-#: src/lib/bnet.c:807 src/lib/bnet.c:832 src/lib/bnet_server.c:208
-#: src/lib/bnet_server.c:366
-#, c-format
-msgid "Cannot set SO_KEEPALIVE on socket: %s\n"
-msgstr ""
-
-#: src/lib/bnet.c:863
-#, c-format
-msgid ""
-"Could not connect to %s on %s:%d. ERR=%s\n"
-"Retrying ...\n"
-msgstr ""
-
-#: src/lib/bnet.c:869
-#, c-format
-msgid "Unable to connect to %s on %s:%d. ERR=%s\n"
-msgstr ""
-
-#: src/lib/bnet.c:962
-msgid "Could not malloc BSOCK data buffer\n"
-msgstr ""
-
-#: src/lib/bnet.c:969 src/lib/bnet.c:993
-#, c-format
-msgid "sockopt error: %s\n"
-msgstr ""
-
-#: src/lib/bnet.c:975 src/lib/bnet.c:999
-#, c-format
-msgid "Warning network buffer = %d bytes not max size.\n"
-msgstr ""
-
-#: src/lib/bnet.c:979 src/lib/bnet.c:1003
-#, c-format
-msgid "Network buffer size %d not multiple of tape block size.\n"
-msgstr ""
-
-#: src/lib/bnet.c:1023 src/lib/bnet.c:1057
-#, c-format
-msgid "fcntl F_GETFL error. ERR=%s\n"
-msgstr ""
-
-#: src/lib/bnet.c:1029 src/lib/bnet.c:1063 src/lib/bnet.c:1088
-#, c-format
-msgid "fcntl F_SETFL error. ERR=%s\n"
-msgstr ""
-
-#: src/lib/bnet.c:1142
+#: src/lib/bnet.c:655
 #, c-format
 msgid "Unknown sig %d"
 msgstr ""
 
-#: src/lib/bnet_server.c:111
+#: src/lib/bnet_server.c:109
 #, c-format
 msgid "Cannot open stream socket. ERR=%s. Current %s All %s\n"
 msgstr ""
 
-#: src/lib/bnet_server.c:124 src/lib/bnet_server.c:273
+#: src/lib/bnet_server.c:122 src/lib/bnet_server.c:275
 #, c-format
 msgid "Cannot set SO_REUSEADDR on socket: %s\n"
 msgstr ""
 
-#: src/lib/bnet_server.c:133
+#: src/lib/bnet_server.c:131
 #, c-format
 msgid "Cannot bind port %d: ERR=%s: Retrying ...\n"
 msgstr ""
 
-#: src/lib/bnet_server.c:138
+#: src/lib/bnet_server.c:136
 #, c-format
 msgid "Cannot bind port %d: ERR=%s.\n"
 msgstr ""
 
-#: src/lib/bnet_server.c:149
+#: src/lib/bnet_server.c:147
 #, c-format
 msgid "Could not init client queue: ERR=%s\n"
 msgstr ""
 
-#: src/lib/bnet_server.c:172 src/lib/bnet_server.c:335
+#: src/lib/bnet_server.c:166 src/lib/bnet_server.c:338
 #, c-format
 msgid "Error in select: %s\n"
 msgstr ""
 
-#: src/lib/bnet_server.c:193 src/lib/bnet_server.c:354
+#: src/lib/bnet_server.c:187 src/lib/bnet_server.c:357
 #, c-format
 msgid "Connection from %s:%d refused by hosts.access\n"
 msgstr ""
 
-#: src/lib/bnet_server.c:219
+#: src/lib/bnet_server.c:202 src/lib/bnet_server.c:370
+#, c-format
+msgid "Cannot set SO_KEEPALIVE on socket: %s\n"
+msgstr ""
+
+#: src/lib/bnet_server.c:213
 msgid "Could not create client BSOCK.\n"
 msgstr ""
 
-#: src/lib/bnet_server.c:226
+#: src/lib/bnet_server.c:220
 #, c-format
 msgid "Could not add job to client queue: ERR=%s\n"
 msgstr ""
@@ -7610,132 +7896,132 @@ msgstr ""
 msgid "Could not destroy client queue: ERR=%s\n"
 msgstr ""
 
-#: src/lib/bnet_server.c:264
+#: src/lib/bnet_server.c:265
 #, c-format
 msgid "Cannot open stream socket: %s\n"
 msgstr ""
 
-#: src/lib/bnet_server.c:293
+#: src/lib/bnet_server.c:295
 #, c-format
 msgid "Cannot bind port %d: ERR=%s: retrying ...\n"
 msgstr ""
 
-#: src/lib/bnet_server.c:299
+#: src/lib/bnet_server.c:301
 msgid "Server socket"
 msgstr ""
 
-#: src/lib/bnet_server.c:299 src/lib/bnet_server.c:393
+#: src/lib/bnet_server.c:301 src/lib/bnet_server.c:398
 msgid "client"
 msgstr ""
 
-#: src/lib/bnet_server.c:381
+#: src/lib/bnet_server.c:386
 #, c-format
 msgid "Socket accept error for %s. ERR=%s\n"
 msgstr ""
 
-#: src/lib/bpipe.c:360 src/lib/bpipe.c:450
+#: src/lib/bpipe.c:362 src/lib/bpipe.c:452
 msgid "Program killed by Bacula watchdog (timeout)\n"
 msgstr ""
 
-#: src/lib/bsys.c:204 src/lib/bsys.c:221 src/lib/bsys.c:244 src/lib/bsys.c:257
+#: src/lib/bsys.c:208 src/lib/bsys.c:225 src/lib/bsys.c:249 src/lib/bsys.c:262
 #, c-format
 msgid "Out of memory: ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:299
+#: src/lib/bsys.c:304
 msgid "Buffer overflow.\n"
 msgstr ""
 
-#: src/lib/bsys.c:365
+#: src/lib/bsys.c:370
 msgid "Bad errno"
 msgstr ""
 
-#: src/lib/bsys.c:382
+#: src/lib/bsys.c:387
 msgid "Possible mutex deadlock.\n"
 msgstr ""
 
-#: src/lib/bsys.c:386 src/lib/bsys.c:419
+#: src/lib/bsys.c:391 src/lib/bsys.c:424
 #, c-format
 msgid "Mutex lock failure. ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:389
+#: src/lib/bsys.c:394
 msgid "Possible mutex deadlock resolved.\n"
 msgstr ""
 
-#: src/lib/bsys.c:402
+#: src/lib/bsys.c:407
 #, c-format
 msgid "Mutex unlock not locked. ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:407 src/lib/bsys.c:429
+#: src/lib/bsys.c:412 src/lib/bsys.c:434
 #, c-format
 msgid "Mutex unlock failure. ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:443
+#: src/lib/bsys.c:448
 #, c-format
 msgid "Memset for %d bytes at %s:%d\n"
 msgstr ""
 
-#: src/lib/bsys.c:472
+#: src/lib/bsys.c:478
 #, c-format
 msgid "Cannot open pid file. %s ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:476
+#: src/lib/bsys.c:493
 #, c-format
 msgid ""
 "%s is already running. pid=%d\n"
 "Check file %s\n"
 msgstr ""
 
-#: src/lib/bsys.c:489
+#: src/lib/bsys.c:507
 #, c-format
 msgid "Could not open pid file. %s ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:594
+#: src/lib/bsys.c:615
 #, c-format
 msgid "Could not create state file. %s ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:613
+#: src/lib/bsys.c:634
 #, c-format
 msgid "Write final hdr error: ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:649
+#: src/lib/bsys.c:670
 #, c-format
 msgid "Could not find userid=%s: ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:655
+#: src/lib/bsys.c:676
 #, c-format
 msgid "Could not find password entry. ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:668
+#: src/lib/bsys.c:689
 #, c-format
 msgid "Could not find group=%s: ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:676
+#: src/lib/bsys.c:697
 #, c-format
 msgid "Could not initgroups for group=%s, userid=%s: ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:679
+#: src/lib/bsys.c:700
 #, c-format
 msgid "Could not initgroups for userid=%s: ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:686
+#: src/lib/bsys.c:707
 #, c-format
 msgid "Could not set group=%s: ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:692
+#: src/lib/bsys.c:713
 #, c-format
 msgid "Could not set specified userid: %s\n"
 msgstr ""
@@ -7748,113 +8034,170 @@ msgstr ""
 msgid "1999 Authorization failed.\n"
 msgstr ""
 
-#: src/lib/crypto.c:434
+#: src/lib/crypto.c:435
 msgid "Unable to open certificate file"
 msgstr ""
 
-#: src/lib/crypto.c:441
+#: src/lib/crypto.c:442
 msgid "Unable to read certificate from file"
 msgstr ""
 
-#: src/lib/crypto.c:447
+#: src/lib/crypto.c:448
 msgid "Unable to extract public key from certificate"
 msgstr ""
 
-#: src/lib/crypto.c:453
+#: src/lib/crypto.c:455
 msgid ""
 "Provided certificate does not include the required subjectKeyIdentifier "
 "extension."
 msgstr ""
 
-#: src/lib/crypto.c:459
+#: src/lib/crypto.c:462
 #, c-format
 msgid "Unsupported key type provided: %d\n"
 msgstr ""
 
-#: src/lib/crypto.c:496 src/lib/crypto.c:544
+#: src/lib/crypto.c:499 src/lib/crypto.c:547
 msgid "Unable to open private key file"
 msgstr ""
 
-#: src/lib/crypto.c:526 src/lib/crypto.c:560
+#: src/lib/crypto.c:529 src/lib/crypto.c:563
 msgid "Unable to read private key from file"
 msgstr ""
 
-#: src/lib/crypto.c:617
+#: src/lib/crypto.c:622
 #, c-format
 msgid "Unsupported digest type: %d\n"
 msgstr ""
 
-#: src/lib/crypto.c:630
+#: src/lib/crypto.c:636
 msgid "OpenSSL digest initialization failed"
 msgstr ""
 
-#: src/lib/crypto.c:786
-msgid "OpenSSL error occured"
+#: src/lib/crypto.c:650
+msgid "OpenSSL digest update failed"
+msgstr ""
+
+#: src/lib/crypto.c:668
+msgid "OpenSSL digest finalize failed"
+msgstr ""
+
+#: src/lib/crypto.c:766
+msgid "OpenSSL digest_new failed"
+msgstr ""
+
+#: src/lib/crypto.c:772
+msgid "OpenSSL sign get digest failed"
 msgstr ""
 
-#: src/lib/crypto.c:852
+#: src/lib/crypto.c:811 src/lib/crypto.c:815
+msgid "OpenSSL digest Verify final failed"
+msgstr ""
+
+#: src/lib/crypto.c:820
+msgid "No signers found for crypto verify.\n"
+msgstr ""
+
+#: src/lib/crypto.c:881
 msgid "Signature creation failed"
 msgstr ""
 
-#: src/lib/crypto.c:929
+#: src/lib/crypto.c:959
 msgid "Signature decoding failed"
 msgstr ""
 
-#: src/lib/crypto.c:1005
+#: src/lib/crypto.c:1036
 msgid "Unsupported cipher type specified\n"
 msgstr ""
 
-#: src/lib/crypto.c:1167
+#: src/lib/crypto.c:1185
 msgid "CryptoData decoding failed"
 msgstr ""
 
-#: src/lib/crypto.c:1211
+#: src/lib/crypto.c:1229
 msgid "Failure decrypting the session key"
 msgstr ""
 
-#: src/lib/crypto.c:1264
+#: src/lib/crypto.c:1280
 #, c-format
 msgid "Unsupported contentEncryptionAlgorithm: %d\n"
 msgstr ""
 
-#: src/lib/crypto.c:1274 src/lib/crypto.c:1280
+#: src/lib/crypto.c:1290 src/lib/crypto.c:1296
 msgid "OpenSSL cipher context initialization failed"
 msgstr ""
 
-#: src/lib/crypto.c:1287
+#: src/lib/crypto.c:1303
 msgid "Encryption session provided an invalid symmetric key"
 msgstr ""
 
-#: src/lib/crypto.c:1293
+#: src/lib/crypto.c:1309
 msgid "Encryption session provided an invalid IV"
 msgstr ""
 
-#: src/lib/crypto.c:1299
+#: src/lib/crypto.c:1315
 msgid "OpenSSL cipher context key/IV initialization failed"
 msgstr ""
 
-#: src/lib/crypto.c:1367
+#: src/lib/crypto.c:1385
 #, c-format
 msgid "Unable to init OpenSSL threading: ERR=%s\n"
 msgstr ""
 
-#: src/lib/crypto.c:1380
+#: src/lib/crypto.c:1398
 msgid "Failed to seed OpenSSL PRNG\n"
 msgstr ""
 
-#: src/lib/crypto.c:1406
+#: src/lib/crypto.c:1424
 msgid "Failed to save OpenSSL PRNG\n"
 msgstr ""
 
-#: src/lib/crypto.c:1464
-msgid "Unsupported digest type specified\n"
+#: src/lib/crypto.c:1485
+#, c-format
+msgid "Unsupported digest type=%d specified\n"
 msgstr ""
 
-#: src/lib/crypto.c:1484
+#: src/lib/crypto.c:1505
 #, c-format
 msgid "SHA1Update() returned an error: %d\n"
 msgstr ""
 
+#: src/lib/crypto.c:1648
+msgid "No error"
+msgstr ""
+
+#: src/lib/crypto.c:1650
+msgid "Signer not found"
+msgstr ""
+
+#: src/lib/crypto.c:1652
+msgid "Recipient not found"
+msgstr ""
+
+#: src/lib/crypto.c:1654
+msgid "Unsupported digest algorithm"
+msgstr ""
+
+#: src/lib/crypto.c:1656
+msgid "Unsupported encryption algorithm"
+msgstr ""
+
+#: src/lib/crypto.c:1658
+msgid "Signature is invalid"
+msgstr ""
+
+#: src/lib/crypto.c:1660
+msgid "Decryption error"
+msgstr ""
+
+#: src/lib/crypto.c:1663
+msgid "Internal error"
+msgstr ""
+
+#: src/lib/crypto.c:1665
+msgid "Unknown error"
+msgstr ""
+
 #: src/lib/daemon.c:66
 #, c-format
 msgid "Cannot fork to become daemon: %s\n"
@@ -7869,29 +8212,29 @@ msgstr ""
 msgid "Name too long.\n"
 msgstr ""
 
-#: src/lib/jcr.c:291
+#: src/lib/jcr.c:297
 msgid "NULL jcr.\n"
 msgstr ""
 
-#: src/lib/jcr.c:415
+#: src/lib/jcr.c:430
 #, c-format
 msgid "JCR use_count=%d JobId=%d\n"
 msgstr ""
 
-#: src/lib/jcr.c:693
+#: src/lib/jcr.c:762
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Storage "
 "daemon.\n"
 msgstr ""
 
-#: src/lib/jcr.c:705
+#: src/lib/jcr.c:774
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading File daemon.\n"
 msgstr ""
 
-#: src/lib/jcr.c:717
+#: src/lib/jcr.c:786
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Director.\n"
@@ -7920,124 +8263,138 @@ msgstr ""
 msgid "Close of NULL file\n"
 msgstr ""
 
-#: src/lib/lex.c:207
+#: src/lib/lex.c:226
 msgid "get_char: called after EOF\n"
 msgstr ""
 
-#: src/lib/lex.c:249
+#: src/lib/lex.c:268
 #, c-format
 msgid "Config token too long, file: %s, line %d, begins at line %d\n"
 msgstr ""
 
-#: src/lib/lex.c:273
+#: src/lib/lex.c:292
 msgid "none"
 msgstr ""
 
-#: src/lib/lex.c:274
+#: src/lib/lex.c:293
 msgid "comment"
 msgstr ""
 
-#: src/lib/lex.c:275
+#: src/lib/lex.c:294
 msgid "number"
 msgstr ""
 
-#: src/lib/lex.c:276
+#: src/lib/lex.c:295
 msgid "ip_addr"
 msgstr ""
 
-#: src/lib/lex.c:277
+#: src/lib/lex.c:296
 msgid "identifier"
 msgstr ""
 
-#: src/lib/lex.c:278
+#: src/lib/lex.c:297
 msgid "string"
 msgstr ""
 
-#: src/lib/lex.c:279
+#: src/lib/lex.c:298
 msgid "quoted_string"
 msgstr ""
 
-#: src/lib/lex.c:315 src/lib/lex.c:321
+#: src/lib/lex.c:299
+msgid "UTF-8 Byte Order Mark"
+msgstr ""
+
+#: src/lib/lex.c:300
+msgid "UTF-16le Byte Order Mark"
+msgstr ""
+
+#: src/lib/lex.c:338 src/lib/lex.c:344
 #, c-format
 msgid "expected a positive integer number, got: %s"
 msgstr ""
 
-#: src/lib/lex.c:544
+#: src/lib/lex.c:454
+msgid ""
+"This config file appears to be in an unsupported Unicode format (UTF-16be). "
+"Please resave as UTF-8\n"
+msgstr ""
+
+#: src/lib/lex.c:583
 #, c-format
 msgid "Cannot open included config file %s: %s\n"
 msgstr ""
 
-#: src/lib/lex.c:600
+#: src/lib/lex.c:642
 #, c-format
 msgid "expected an integer or a range, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:614 src/lib/lex.c:622 src/lib/lex.c:633 src/lib/lex.c:641
+#: src/lib/lex.c:656 src/lib/lex.c:664 src/lib/lex.c:675 src/lib/lex.c:683
 #, c-format
 msgid "expected an integer number, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:651
+#: src/lib/lex.c:693
 #, c-format
 msgid "expected a name, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:655
+#: src/lib/lex.c:697
 #, c-format
 msgid "name %s length %d too long, max is %d\n"
 msgstr ""
 
-#: src/lib/lex.c:663
+#: src/lib/lex.c:705
 #, c-format
 msgid "expected a string, got %s: %s"
 msgstr ""
 
-#: src/lib/mem_pool.c:107
+#: src/lib/mem_pool.c:108
 #, c-format
 msgid "MemPool index %d larger than max %d\n"
 msgstr ""
 
-#: src/lib/mem_pool.c:125 src/lib/mem_pool.c:145 src/lib/mem_pool.c:180
-#: src/lib/mem_pool.c:252 src/lib/mem_pool.c:272 src/lib/mem_pool.c:310
-#: src/lib/mem_pool.c:563
+#: src/lib/mem_pool.c:126 src/lib/mem_pool.c:146 src/lib/mem_pool.c:181
+#: src/lib/mem_pool.c:253 src/lib/mem_pool.c:273 src/lib/mem_pool.c:311
+#: src/lib/mem_pool.c:583
 #, c-format
 msgid "Out of memory requesting %d bytes\n"
 msgstr ""
 
-#: src/lib/message.c:265 src/lib/message.c:275
+#: src/lib/message.c:268 src/lib/message.c:278
 #, c-format
 msgid "Could not open console message file %s: ERR=%s\n"
 msgstr ""
 
-#: src/lib/message.c:280
+#: src/lib/message.c:283
 #, c-format
 msgid "Could not get con mutex: ERR=%s\n"
 msgstr ""
 
-#: src/lib/message.c:384
+#: src/lib/message.c:387
 #, c-format
 msgid "open mail pipe %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/message.c:390
+#: src/lib/message.c:393
 msgid "Bacula Message"
 msgstr ""
 
-#: src/lib/message.c:449
+#: src/lib/message.c:453
 msgid "open mail pipe failed.\n"
 msgstr ""
 
-#: src/lib/message.c:461
+#: src/lib/message.c:465
 #, c-format
 msgid "close error: ERR=%s\n"
 msgstr ""
 
-#: src/lib/message.c:472
+#: src/lib/message.c:476
 #, c-format
 msgid "Mail prog: %s"
 msgstr ""
 
-#: src/lib/message.c:481
+#: src/lib/message.c:485
 #, c-format
 msgid ""
 "Mail program terminated in error.\n"
@@ -8045,12 +8402,12 @@ msgid ""
 "ERR=%s\n"
 msgstr ""
 
-#: src/lib/message.c:575 src/lib/message.c:719
+#: src/lib/message.c:584 src/lib/message.c:735
 #, c-format
 msgid "fopen %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/message.c:701
+#: src/lib/message.c:717
 #, c-format
 msgid ""
 "Operator mail program terminated in error.\n"
@@ -8058,83 +8415,83 @@ msgid ""
 "ERR=%s\n"
 msgstr ""
 
-#: src/lib/message.c:998
+#: src/lib/message.c:1015
 #, c-format
 msgid "%s: ABORTING due to ERROR in %s:%d\n"
 msgstr ""
 
-#: src/lib/message.c:1002
+#: src/lib/message.c:1019
 #, c-format
 msgid "%s: ERROR TERMINATION at %s:%d\n"
 msgstr ""
 
-#: src/lib/message.c:1007
+#: src/lib/message.c:1024
 #, c-format
 msgid "%s: Fatal Error because: "
 msgstr ""
 
-#: src/lib/message.c:1009
+#: src/lib/message.c:1026
 #, c-format
 msgid "%s: Fatal Error at %s:%d because:\n"
 msgstr ""
 
-#: src/lib/message.c:1013
+#: src/lib/message.c:1030
 #, c-format
 msgid "%s: ERROR: "
 msgstr ""
 
-#: src/lib/message.c:1015
+#: src/lib/message.c:1032
 #, c-format
 msgid "%s: ERROR in %s:%d "
 msgstr ""
 
-#: src/lib/message.c:1018
+#: src/lib/message.c:1035
 #, c-format
 msgid "%s: Warning: "
 msgstr ""
 
-#: src/lib/message.c:1021
+#: src/lib/message.c:1038
 #, c-format
 msgid "%s: Security violation: "
 msgstr ""
 
-#: src/lib/message.c:1097
+#: src/lib/message.c:1114
 #, c-format
 msgid "%s ABORTING due to ERROR\n"
 msgstr ""
 
-#: src/lib/message.c:1100
+#: src/lib/message.c:1117
 #, c-format
 msgid "%s ERROR TERMINATION\n"
 msgstr ""
 
-#: src/lib/message.c:1103
+#: src/lib/message.c:1120
 #, c-format
 msgid "%s: %s Fatal error: "
 msgstr ""
 
-#: src/lib/message.c:1109
+#: src/lib/message.c:1126
 #, c-format
 msgid "%s: %s Error: "
 msgstr ""
 
-#: src/lib/message.c:1115
+#: src/lib/message.c:1132
 #, c-format
 msgid "%s: %s Warning: "
 msgstr ""
 
-#: src/lib/message.c:1118
+#: src/lib/message.c:1135
 #, c-format
 msgid "%s: %s Security violation: "
 msgstr ""
 
-#: src/lib/openssl.c:100 src/lib/openssl.c:157 src/stored/dev.c:225
-#: src/stored/dev.c:243 src/stored/dev.c:249 src/stored/stored_conf.c:610
+#: src/lib/openssl.c:118 src/lib/openssl.c:179 src/stored/dev.c:218
+#: src/stored/dev.c:236 src/stored/dev.c:243 src/stored/stored_conf.c:611
 #, c-format
 msgid "Unable to init mutex: ERR=%s\n"
 msgstr ""
 
-#: src/lib/openssl.c:120 src/lib/openssl.c:189
+#: src/lib/openssl.c:140 src/lib/openssl.c:213
 #, c-format
 msgid "Unable to destroy mutex: ERR=%s\n"
 msgstr ""
@@ -8143,113 +8500,119 @@ msgstr ""
 msgid "***UNKNOWN***"
 msgstr ""
 
-#: src/lib/parse_conf.c:199
+#: src/lib/parse_conf.c:200
 #, c-format
 msgid "Unable to initialize resource lock. ERR=%s\n"
 msgstr ""
 
-#: src/lib/parse_conf.c:286 src/lib/parse_conf.c:305
+#: src/lib/parse_conf.c:287 src/lib/parse_conf.c:306
 #, c-format
 msgid "expected an =, got: %s"
 msgstr ""
 
-#: src/lib/parse_conf.c:313
+#: src/lib/parse_conf.c:314
 #, c-format
 msgid "Unknown item code: %d\n"
 msgstr ""
 
-#: src/lib/parse_conf.c:353
+#: src/lib/parse_conf.c:354
 #, c-format
 msgid "message type: %s not found"
 msgstr ""
 
-#: src/lib/parse_conf.c:390
+#: src/lib/parse_conf.c:391
 #, c-format
 msgid "Attempt to redefine name \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/lib/parse_conf.c:485
+#: src/lib/parse_conf.c:486
 #, c-format
 msgid "Attempt to redefine resource \"%s\" referenced on line %d : %s\n"
 msgstr ""
 
-#: src/lib/parse_conf.c:520
+#: src/lib/parse_conf.c:521
 #, c-format
 msgid "Too many %s directives. Max. is %d. line %d: %s\n"
 msgstr ""
 
-#: src/lib/parse_conf.c:530
+#: src/lib/parse_conf.c:531
 #, c-format
 msgid "Could not find config Resource \"%s\" referenced on line %d : %s\n"
 msgstr ""
 
-#: src/lib/parse_conf.c:592
+#: src/lib/parse_conf.c:593
 #, c-format
 msgid "Missing config Resource \"%s\" referenced on line %d : %s\n"
 msgstr ""
 
-#: src/lib/parse_conf.c:656
+#: src/lib/parse_conf.c:657
 #, c-format
 msgid "expected a size number, got: %s"
 msgstr ""
 
-#: src/lib/parse_conf.c:661
+#: src/lib/parse_conf.c:662
 #, c-format
 msgid "expected a size, got: %s"
 msgstr ""
 
-#: src/lib/parse_conf.c:698 src/lib/parse_conf.c:703
+#: src/lib/parse_conf.c:699 src/lib/parse_conf.c:704
 #, c-format
 msgid "expected a time period, got: %s"
 msgstr ""
 
-#: src/lib/parse_conf.c:762
+#: src/lib/parse_conf.c:763
 #, c-format
 msgid "Expected a Tape Label keyword, got: %s"
 msgstr ""
 
-#: src/lib/parse_conf.c:818
+#: src/lib/parse_conf.c:819
 #, c-format
 msgid "Cannot open config file \"%s\": %s\n"
 msgstr ""
 
 #: src/lib/parse_conf.c:835
+msgid ""
+"Currently we cannot handle UTF-16 source files. Please convert the conf file "
+"to UTF-8\n"
+msgstr ""
+
+#: src/lib/parse_conf.c:839
 #, c-format
 msgid "Expected a Resource name identifier, got: %s"
 msgstr ""
 
-#: src/lib/parse_conf.c:847
+#: src/lib/parse_conf.c:852
 #, c-format
 msgid "expected resource name, got: %s"
 msgstr ""
 
-#: src/lib/parse_conf.c:858
+#: src/lib/parse_conf.c:863
 #, c-format
 msgid "not in resource definition: %s"
 msgstr ""
 
-#: src/lib/parse_conf.c:883
+#: src/lib/parse_conf.c:888
 #, c-format
 msgid ""
 "Keyword \"%s\" not permitted in this resource.\n"
 "Perhaps you left the trailing brace off of the previous resource."
 msgstr ""
 
-#: src/lib/parse_conf.c:894
+#: src/lib/parse_conf.c:899
 msgid "Name not specified for resource"
 msgstr ""
 
-#: src/lib/parse_conf.c:903
+#: src/lib/parse_conf.c:908
 #, c-format
 msgid "unexpected token %d %s in resource definition"
 msgstr ""
 
-#: src/lib/parse_conf.c:909
+#: src/lib/parse_conf.c:914
 #, c-format
 msgid "Unknown parser state %d\n"
 msgstr ""
 
-#: src/lib/parse_conf.c:914
+#: src/lib/parse_conf.c:919
 msgid "End of conf file reached with unclosed resource."
 msgstr ""
 
@@ -8300,22 +8663,22 @@ msgstr ""
 msgid "rwl_writeunlock failure at %s:%d:. ERR=%s\n"
 msgstr ""
 
-#: src/lib/runscript.c:213
+#: src/lib/runscript.c:212
 #, c-format
 msgid "%s: run command \"%s\"\n"
 msgstr ""
 
-#: src/lib/runscript.c:219
+#: src/lib/runscript.c:218
 #, c-format
 msgid "Runscript: %s could not execute. ERR=%s\n"
 msgstr ""
 
-#: src/lib/runscript.c:228
+#: src/lib/runscript.c:227
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: src/lib/runscript.c:233
+#: src/lib/runscript.c:232
 #, c-format
 msgid "Runscript: %s returned non-zero status=%d. ERR=%s\n"
 msgstr ""
@@ -8328,83 +8691,83 @@ msgstr ""
 msgid "rwl_writeunlock by non-owner.\n"
 msgstr ""
 
-#: src/lib/rwlock.c:366
+#: src/lib/rwlock.c:367
 #, c-format
 msgid "Write lock failed. ERR=%s\n"
 msgstr ""
 
-#: src/lib/rwlock.c:373
+#: src/lib/rwlock.c:375
 #, c-format
 msgid "Write unlock failed. ERR=%s\n"
 msgstr ""
 
-#: src/lib/rwlock.c:383
+#: src/lib/rwlock.c:386
 #, c-format
 msgid "Read lock failed. ERR=%s\n"
 msgstr ""
 
-#: src/lib/rwlock.c:390
+#: src/lib/rwlock.c:394
 #, c-format
 msgid "Read unlock failed. ERR=%s\n"
 msgstr ""
 
-#: src/lib/rwlock.c:399
+#: src/lib/rwlock.c:403
 #, c-format
 msgid "Thread %d found unchanged elements %d times\n"
 msgstr ""
 
-#: src/lib/rwlock.c:431
+#: src/lib/rwlock.c:436
 #, c-format
 msgid "Init rwlock failed. ERR=%s\n"
 msgstr ""
 
-#: src/lib/rwlock.c:446
+#: src/lib/rwlock.c:452
 #, c-format
 msgid "Create thread failed. ERR=%s\n"
 msgstr ""
 
-#: src/lib/rwlock.c:457
+#: src/lib/rwlock.c:464
 #, c-format
 msgid "Join thread failed. ERR=%s\n"
 msgstr ""
 
-#: src/lib/rwlock.c:460
+#: src/lib/rwlock.c:467
 #, c-format
 msgid "%02d: interval %d, writes %d, reads %d\n"
 msgstr ""
 
-#: src/lib/rwlock.c:470
+#: src/lib/rwlock.c:477
 #, c-format
 msgid "data %02d: value %d, %d writes\n"
 msgstr ""
 
-#: src/lib/rwlock.c:475
+#: src/lib/rwlock.c:482
 #, c-format
 msgid "Total: %d thread writes, %d data writes\n"
 msgstr ""
 
-#: src/lib/rwlock.c:547
+#: src/lib/rwlock.c:554
 msgid "Try write lock"
 msgstr ""
 
-#: src/lib/rwlock.c:553
+#: src/lib/rwlock.c:560
 msgid "Try read lock"
 msgstr ""
 
-#: src/lib/rwlock.c:608
+#: src/lib/rwlock.c:615
 msgid "Create thread"
 msgstr ""
 
-#: src/lib/rwlock.c:618
+#: src/lib/rwlock.c:625
 msgid "Join thread"
 msgstr ""
 
-#: src/lib/rwlock.c:620
+#: src/lib/rwlock.c:627
 #, c-format
 msgid "%02d: interval %d, updates %d, r_collisions %d, w_collisions %d\n"
 msgstr ""
 
-#: src/lib/rwlock.c:632
+#: src/lib/rwlock.c:639
 #, c-format
 msgid "data %02d: value %d, %d updates\n"
 msgstr ""
@@ -8420,7 +8783,7 @@ msgstr ""
 
 #: src/lib/signal.c:107
 #, c-format
-msgid "Kaboom! %s, %s got signal %d. Attempting traceback.\n"
+msgid "Kaboom! %s, %s got signal %d - %s. Attempting traceback.\n"
 msgstr ""
 
 #: src/lib/signal.c:109
@@ -8438,341 +8801,346 @@ msgstr ""
 msgid "Calling: %s %s %s\n"
 msgstr ""
 
-#: src/lib/signal.c:152
+#: src/lib/signal.c:153
 #, c-format
 msgid "execv: %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/signal.c:167
+#: src/lib/signal.c:168
 #, c-format
 msgid "Traceback complete, attempting cleanup ...\n"
 msgstr ""
 
-#: src/lib/signal.c:175
+#: src/lib/signal.c:176
 #, c-format
 msgid "It looks like the traceback worked ...\n"
 msgstr ""
 
-#: src/lib/signal.c:204
+#: src/lib/signal.c:205
 #, c-format
 msgid "BA_NSIG too small (%d) should be (%d)\n"
 msgstr ""
 
-#: src/lib/signal.c:210
+#: src/lib/signal.c:211
 msgid "UNKNOWN SIGNAL"
 msgstr ""
 
-#: src/lib/signal.c:211
+#: src/lib/signal.c:212
 msgid "Hangup"
 msgstr ""
 
-#: src/lib/signal.c:212
+#: src/lib/signal.c:213
 msgid "Interrupt"
 msgstr ""
 
-#: src/lib/signal.c:213
+#: src/lib/signal.c:214
 msgid "Quit"
 msgstr ""
 
-#: src/lib/signal.c:214
+#: src/lib/signal.c:215
 msgid "Illegal instruction"
 msgstr ""
 
-#: src/lib/signal.c:215
+#: src/lib/signal.c:216
 msgid "Trace/Breakpoint trap"
 msgstr ""
 
-#: src/lib/signal.c:216
+#: src/lib/signal.c:217
 msgid "Abort"
 msgstr ""
 
-#: src/lib/signal.c:218
+#: src/lib/signal.c:219
 msgid "EMT instruction (Emulation Trap)"
 msgstr ""
 
-#: src/lib/signal.c:221
+#: src/lib/signal.c:222
 msgid "IOT trap"
 msgstr ""
 
-#: src/lib/signal.c:223
+#: src/lib/signal.c:224
 msgid "BUS error"
 msgstr ""
 
-#: src/lib/signal.c:224
+#: src/lib/signal.c:225
 msgid "Floating-point exception"
 msgstr ""
 
-#: src/lib/signal.c:225
+#: src/lib/signal.c:226
 msgid "Kill, unblockable"
 msgstr ""
 
-#: src/lib/signal.c:226
+#: src/lib/signal.c:227
 msgid "User-defined signal 1"
 msgstr ""
 
-#: src/lib/signal.c:227
+#: src/lib/signal.c:228
 msgid "Segmentation violation"
 msgstr ""
 
-#: src/lib/signal.c:228
+#: src/lib/signal.c:229
 msgid "User-defined signal 2"
 msgstr ""
 
-#: src/lib/signal.c:229
+#: src/lib/signal.c:230
 msgid "Broken pipe"
 msgstr ""
 
-#: src/lib/signal.c:230
+#: src/lib/signal.c:231
 msgid "Alarm clock"
 msgstr ""
 
-#: src/lib/signal.c:231
+#: src/lib/signal.c:232
 msgid "Termination"
 msgstr ""
 
-#: src/lib/signal.c:233
+#: src/lib/signal.c:234
 msgid "Stack fault"
 msgstr ""
 
-#: src/lib/signal.c:235
+#: src/lib/signal.c:236
 msgid "Child status has changed"
 msgstr ""
 
-#: src/lib/signal.c:236
+#: src/lib/signal.c:237
 msgid "Continue"
 msgstr ""
 
-#: src/lib/signal.c:237
+#: src/lib/signal.c:238
 msgid "Stop, unblockable"
 msgstr ""
 
-#: src/lib/signal.c:238
+#: src/lib/signal.c:239
 msgid "Keyboard stop"
 msgstr ""
 
-#: src/lib/signal.c:239
+#: src/lib/signal.c:240
 msgid "Background read from tty"
 msgstr ""
 
-#: src/lib/signal.c:240
+#: src/lib/signal.c:241
 msgid "Background write to tty"
 msgstr ""
 
-#: src/lib/signal.c:241
+#: src/lib/signal.c:242
 msgid "Urgent condition on socket"
 msgstr ""
 
-#: src/lib/signal.c:242
+#: src/lib/signal.c:243
 msgid "CPU limit exceeded"
 msgstr ""
 
-#: src/lib/signal.c:243
+#: src/lib/signal.c:244
 msgid "File size limit exceeded"
 msgstr ""
 
-#: src/lib/signal.c:244
+#: src/lib/signal.c:245
 msgid "Virtual alarm clock"
 msgstr ""
 
-#: src/lib/signal.c:245
+#: src/lib/signal.c:246
 msgid "Profiling alarm clock"
 msgstr ""
 
-#: src/lib/signal.c:246
+#: src/lib/signal.c:247
 msgid "Window size change"
 msgstr ""
 
-#: src/lib/signal.c:247
+#: src/lib/signal.c:248
 msgid "I/O now possible"
 msgstr ""
 
-#: src/lib/signal.c:249
+#: src/lib/signal.c:250
 msgid "Power failure restart"
 msgstr ""
 
-#: src/lib/signal.c:252
+#: src/lib/signal.c:253
 msgid "No runnable lwp"
 msgstr ""
 
-#: src/lib/signal.c:255
+#: src/lib/signal.c:256
 msgid "SIGLWP special signal used by thread library"
 msgstr ""
 
-#: src/lib/signal.c:258
+#: src/lib/signal.c:259
 msgid "Checkpoint Freeze"
 msgstr ""
 
-#: src/lib/signal.c:261
+#: src/lib/signal.c:262
 msgid "Checkpoint Thaw"
 msgstr ""
 
-#: src/lib/signal.c:264
+#: src/lib/signal.c:265
 msgid "Thread Cancellation"
 msgstr ""
 
-#: src/lib/signal.c:267
+#: src/lib/signal.c:268
 msgid "Resource Lost (e.g. record-lock lost)"
 msgstr ""
 
-#: src/lib/smartall.c:144 src/lib/smartall.c:242 src/lib/smartall.c:257
+#: src/lib/smartall.c:146 src/lib/smartall.c:255 src/lib/smartall.c:270
 msgid "Out of memory\n"
 msgstr ""
 
-#: src/lib/smartall.c:149
+#: src/lib/smartall.c:151
 msgid "Too much memory used."
 msgstr ""
 
-#: src/lib/smartall.c:177
+#: src/lib/smartall.c:180
 #, c-format
 msgid "Attempt to free NULL called from %s:%d\n"
 msgstr ""
 
-#: src/lib/smartall.c:193
+#: src/lib/smartall.c:194
+#, c-format
+msgid "double free from %s:%d\n"
+msgstr ""
+
+#: src/lib/smartall.c:202
 #, c-format
 msgid "qp->qnext->qprev != qp called from %s:%d\n"
 msgstr ""
 
-#: src/lib/smartall.c:197
+#: src/lib/smartall.c:206
 #, c-format
 msgid "qp->qprev->qnext != qp called from %s:%d\n"
 msgstr ""
 
-#: src/lib/smartall.c:206
+#: src/lib/smartall.c:215
 #, c-format
 msgid "Buffer overrun called from %s:%d\n"
 msgstr ""
 
-#: src/lib/smartall.c:279
+#: src/lib/smartall.c:292
 #, c-format
 msgid "sm_realloc size: %d\n"
 msgstr ""
 
-#: src/lib/smartall.c:320
+#: src/lib/smartall.c:330
 #, c-format
 msgid "sm_realloc %d at %x from %s:%d\n"
 msgstr ""
 
-#: src/lib/smartall.c:382
+#: src/lib/smartall.c:392
 #, c-format
 msgid ""
 "\n"
 "Orphaned buffers exist.  Dump terminated following\n"
 "  discovery of bad links in chain of orphaned buffers.\n"
-"  Buffer address with bad links: %lx\n"
+"  Buffer address with bad links: %p\n"
 msgstr ""
 
-#: src/lib/smartall.c:394
+#: src/lib/smartall.c:404
 #, c-format
-msgid "Orphaned buffer:  %s %6u bytes buf=%p allocated at %s:%d\n"
+msgid "%s buffer:  %s %6u bytes buf=%p allocated at %s:%d\n"
 msgstr ""
 
-#: src/lib/smartall.c:429
+#: src/lib/smartall.c:440
 #, c-format
 msgid "Damaged buffer found. Called from %s:%d\n"
 msgstr ""
 
-#: src/lib/smartall.c:459
+#: src/lib/smartall.c:470
 #, c-format
 msgid ""
 "\n"
 "Damaged buffers found at %s:%d\n"
 msgstr ""
 
-#: src/lib/smartall.c:462
+#: src/lib/smartall.c:473
 #, c-format
 msgid "  discovery of bad prev link.\n"
 msgstr ""
 
-#: src/lib/smartall.c:465
+#: src/lib/smartall.c:476
 #, c-format
 msgid "  discovery of bad next link.\n"
 msgstr ""
 
-#: src/lib/smartall.c:468
+#: src/lib/smartall.c:479
 #, c-format
 msgid "  discovery of data overrun.\n"
 msgstr ""
 
-#: src/lib/smartall.c:471
+#: src/lib/smartall.c:482
 #, c-format
-msgid "  Buffer address: %lx\n"
+msgid "  Buffer address: %p\n"
 msgstr ""
 
-#: src/lib/smartall.c:478
+#: src/lib/smartall.c:489
 #, c-format
 msgid "Damaged buffer:  %6u bytes allocated at line %d of %s %s\n"
 msgstr ""
 
-#: src/lib/tls.c:92
+#: src/lib/tls.c:93
 #, c-format
 msgid ""
 "Error with certificate at depth: %d, issuer = %s, subject = %s, ERR=%d:%s\n"
 msgstr ""
 
-#: src/lib/tls.c:129
+#: src/lib/tls.c:130
 msgid "Error initializing SSL context"
 msgstr ""
 
-#: src/lib/tls.c:150
+#: src/lib/tls.c:151
 msgid "Error loading certificate verification stores"
 msgstr ""
 
-#: src/lib/tls.c:155
+#: src/lib/tls.c:156
 msgid ""
 "Either a certificate file or a directory must be specified as a verification "
 "store\n"
 msgstr ""
 
-#: src/lib/tls.c:166
+#: src/lib/tls.c:167
 msgid "Error loading certificate file"
 msgstr ""
 
-#: src/lib/tls.c:174
+#: src/lib/tls.c:175
 msgid "Error loading private key"
 msgstr ""
 
-#: src/lib/tls.c:182
+#: src/lib/tls.c:183
 msgid "Unable to open DH parameters file"
 msgstr ""
 
-#: src/lib/tls.c:188
+#: src/lib/tls.c:189
 msgid "Unable to load DH parameters from specified file"
 msgstr ""
 
-#: src/lib/tls.c:192
+#: src/lib/tls.c:193
 msgid "Failed to set TLS Diffie-Hellman parameters"
 msgstr ""
 
-#: src/lib/tls.c:201
+#: src/lib/tls.c:203
 msgid "Error setting cipher list, no valid ciphers available\n"
 msgstr ""
 
-#: src/lib/tls.c:249
+#: src/lib/tls.c:262
 msgid "Peer failed to present a TLS certificate\n"
 msgstr ""
 
-#: src/lib/tls.c:291
+#: src/lib/tls.c:305
 #, c-format
 msgid "Peer %s failed to present a TLS certificate\n"
 msgstr ""
 
-#: src/lib/tls.c:394
+#: src/lib/tls.c:407
 msgid "Error creating file descriptor-based BIO"
 msgstr ""
 
-#: src/lib/tls.c:405
+#: src/lib/tls.c:418
 msgid "Error creating new SSL object"
 msgstr ""
 
-#: src/lib/tls.c:469 src/lib/tls.c:492
+#: src/lib/tls.c:481 src/lib/tls.c:504
 msgid "Connect failure"
 msgstr ""
 
-#: src/lib/tls.c:569 src/lib/tls.c:573
+#: src/lib/tls.c:576 src/lib/tls.c:580
 msgid "TLS shutdown failure."
 msgstr ""
 
-#: src/lib/tls.c:622 src/lib/tls.c:642
+#: src/lib/tls.c:639
 msgid "TLS read/write failure."
 msgstr ""
 
@@ -8899,315 +9267,325 @@ msgstr ""
 msgid "Working Directory: \"%s\" is not a directory. Cannot continue.\n"
 msgstr ""
 
-#: src/lib/var.c:2668
+#: src/lib/var.c:2669
 msgid "everything ok"
 msgstr ""
 
-#: src/lib/var.c:2669
+#: src/lib/var.c:2670
 msgid "incomplete named character"
 msgstr ""
 
-#: src/lib/var.c:2670
+#: src/lib/var.c:2671
 msgid "incomplete hexadecimal value"
 msgstr ""
 
-#: src/lib/var.c:2671
+#: src/lib/var.c:2672
 msgid "invalid hexadecimal value"
 msgstr ""
 
-#: src/lib/var.c:2672
+#: src/lib/var.c:2673
 msgid "octal value too large"
 msgstr ""
 
-#: src/lib/var.c:2673
+#: src/lib/var.c:2674
 msgid "invalid octal value"
 msgstr ""
 
-#: src/lib/var.c:2674
+#: src/lib/var.c:2675
 msgid "incomplete octal value"
 msgstr ""
 
-#: src/lib/var.c:2675
+#: src/lib/var.c:2676
 msgid "incomplete grouped hexadecimal value"
 msgstr ""
 
-#: src/lib/var.c:2676
+#: src/lib/var.c:2677
 msgid "incorrect character class specification"
 msgstr ""
 
-#: src/lib/var.c:2677
+#: src/lib/var.c:2678
 msgid "invalid expansion configuration"
 msgstr ""
 
-#: src/lib/var.c:2678
+#: src/lib/var.c:2679
 msgid "out of memory"
 msgstr ""
 
-#: src/lib/var.c:2679
+#: src/lib/var.c:2680
 msgid "incomplete variable specification"
 msgstr ""
 
-#: src/lib/var.c:2680
+#: src/lib/var.c:2681
 msgid "undefined variable"
 msgstr ""
 
-#: src/lib/var.c:2681
+#: src/lib/var.c:2682
 msgid "input is neither text nor variable"
 msgstr ""
 
-#: src/lib/var.c:2682
+#: src/lib/var.c:2683
 msgid "unknown command character in variable"
 msgstr ""
 
-#: src/lib/var.c:2683
+#: src/lib/var.c:2684
 msgid "malformatted search and replace operation"
 msgstr ""
 
-#: src/lib/var.c:2684
+#: src/lib/var.c:2685
 msgid "unknown flag in search and replace operation"
 msgstr ""
 
-#: src/lib/var.c:2685
+#: src/lib/var.c:2686
 msgid "invalid regex in search and replace operation"
 msgstr ""
 
-#: src/lib/var.c:2686
+#: src/lib/var.c:2687
 msgid "missing parameter in command"
 msgstr ""
 
-#: src/lib/var.c:2687
+#: src/lib/var.c:2688
 msgid "empty search string in search and replace operation"
 msgstr ""
 
-#: src/lib/var.c:2688
+#: src/lib/var.c:2689
 msgid "start offset missing in cut operation"
 msgstr ""
 
-#: src/lib/var.c:2689
+#: src/lib/var.c:2690
 msgid "offsets in cut operation delimited by unknown character"
 msgstr ""
 
-#: src/lib/var.c:2690
+#: src/lib/var.c:2691
 msgid "range out of bounds in cut operation"
 msgstr ""
 
-#: src/lib/var.c:2691
+#: src/lib/var.c:2692
 msgid "offset out of bounds in cut operation"
 msgstr ""
 
-#: src/lib/var.c:2692
+#: src/lib/var.c:2693
 msgid "logic error in cut operation"
 msgstr ""
 
-#: src/lib/var.c:2693
+#: src/lib/var.c:2694
 msgid "malformatted transpose operation"
 msgstr ""
 
-#: src/lib/var.c:2694
+#: src/lib/var.c:2695
 msgid "source and target class mismatch in transpose operation"
 msgstr ""
 
-#: src/lib/var.c:2695
+#: src/lib/var.c:2696
 msgid "empty character class in transpose operation"
 msgstr ""
 
-#: src/lib/var.c:2696
+#: src/lib/var.c:2697
 msgid "incorrect character class in transpose operation"
 msgstr ""
 
-#: src/lib/var.c:2697
+#: src/lib/var.c:2698
 msgid "malformatted padding operation"
 msgstr ""
 
-#: src/lib/var.c:2698
+#: src/lib/var.c:2699
 msgid "width parameter missing in padding operation"
 msgstr ""
 
-#: src/lib/var.c:2699
+#: src/lib/var.c:2700
 msgid "fill string missing in padding operation"
 msgstr ""
 
-#: src/lib/var.c:2700
+#: src/lib/var.c:2701
 msgid "unknown quoted pair in search and replace operation"
 msgstr ""
 
-#: src/lib/var.c:2701
+#: src/lib/var.c:2702
 msgid "sub-matching reference out of range"
 msgstr ""
 
-#: src/lib/var.c:2702
+#: src/lib/var.c:2703
 msgid "invalid argument"
 msgstr ""
 
-#: src/lib/var.c:2703
+#: src/lib/var.c:2704
 msgid "incomplete quoted pair"
 msgstr ""
 
-#: src/lib/var.c:2704
+#: src/lib/var.c:2705
 msgid "lookup function does not support variable arrays"
 msgstr ""
 
-#: src/lib/var.c:2705
+#: src/lib/var.c:2706
 msgid "index of array variable contains an invalid character"
 msgstr ""
 
-#: src/lib/var.c:2706
+#: src/lib/var.c:2707
 msgid "index of array variable is incomplete"
 msgstr ""
 
-#: src/lib/var.c:2707
+#: src/lib/var.c:2708
 msgid "bracket expression in array variable's index not closed"
 msgstr ""
 
-#: src/lib/var.c:2708
+#: src/lib/var.c:2709
 msgid "division by zero error in index specification"
 msgstr ""
 
-#: src/lib/var.c:2709
+#: src/lib/var.c:2710
 msgid "unterminated loop construct"
 msgstr ""
 
-#: src/lib/var.c:2710
+#: src/lib/var.c:2711
 msgid "invalid character in loop limits"
 msgstr ""
 
-#: src/lib/var.c:2711
+#: src/lib/var.c:2712
 msgid "malformed operation argument list"
 msgstr ""
 
-#: src/lib/var.c:2712
+#: src/lib/var.c:2713
 msgid "undefined operation"
 msgstr ""
 
-#: src/lib/var.c:2713
+#: src/lib/var.c:2714
 msgid "formatting failure"
 msgstr ""
 
-#: src/lib/var.c:2722
+#: src/lib/var.c:2723
 msgid "unknown error"
 msgstr ""
 
-#: src/lib/watchdog.c:82
+#: src/lib/watchdog.c:83
 #, c-format
 msgid "Unable to initialize watchdog lock. ERR=%s\n"
 msgstr ""
 
-#: src/lib/watchdog.c:178
+#: src/lib/watchdog.c:180
 msgid "BUG! register_watchdog called before start_watchdog\n"
 msgstr ""
 
-#: src/lib/watchdog.c:181
+#: src/lib/watchdog.c:183
 #, c-format
 msgid "BUG! Watchdog %p has NULL callback\n"
 msgstr ""
 
-#: src/lib/watchdog.c:184
+#: src/lib/watchdog.c:186
 #, c-format
 msgid "BUG! Watchdog %p has zero interval\n"
 msgstr ""
 
-#: src/lib/watchdog.c:204
+#: src/lib/watchdog.c:206
 msgid "BUG! unregister_watchdog_unlocked called before start_watchdog\n"
 msgstr ""
 
-#: src/lib/watchdog.c:322
+#: src/lib/watchdog.c:325
 #, c-format
 msgid "rwl_writelock failure. ERR=%s\n"
 msgstr ""
 
-#: src/lib/watchdog.c:336
+#: src/lib/watchdog.c:340
 #, c-format
 msgid "rwl_writeunlock failure. ERR=%s\n"
 msgstr ""
 
 #: src/stored/acquire.c:69
 #, c-format
-msgid "Num_writers=%d not zero. Job %d canceled.\n"
+msgid "Acquire read: num_writers=%d not zero. Job %d canceled.\n"
 msgstr ""
 
 #: src/stored/acquire.c:78
 #, c-format
-msgid "No volumes specified. Job %s canceled.\n"
+msgid "No volumes specified for reading. Job %s canceled.\n"
 msgstr ""
 
 #: src/stored/acquire.c:87
 #, c-format
-msgid "Logic error: no next volume. Numvol=%d Curvol=%d\n"
+msgid "Logic error: no next volume to read. Numvol=%d Curvol=%d\n"
 msgstr ""
 
-#: src/stored/acquire.c:144
+#: src/stored/acquire.c:113
+#, c-format
+msgid ""
+"Changing device. Want Media Type=\"%s\" have=\"%s\"\n"
+"  device=%s\n"
+msgstr ""
+
+#: src/stored/acquire.c:151
 #, c-format
 msgid "Media Type change.  New device %s chosen.\n"
 msgstr ""
 
-#: src/stored/acquire.c:155
+#: src/stored/acquire.c:162
 #, c-format
 msgid "No suitable device found to read Volume \"%s\"\n"
 msgstr ""
 
-#: src/stored/acquire.c:185
+#: src/stored/acquire.c:191
 #, c-format
 msgid "Job %s canceled.\n"
 msgstr ""
 
-#: src/stored/acquire.c:199
+#: src/stored/acquire.c:205
 #, c-format
 msgid "Read open device %s Volume \"%s\" failed: ERR=%s\n"
 msgstr ""
 
-#: src/stored/acquire.c:271 src/stored/mount.c:90
+#: src/stored/acquire.c:276
 #, c-format
-msgid "Too many errors trying to mount device %s.\n"
+msgid "Too many errors trying to mount device %s for reading.\n"
 msgstr ""
 
-#: src/stored/acquire.c:280
+#: src/stored/acquire.c:285
 #, c-format
 msgid "Ready to read from volume \"%s\" on device %s.\n"
 msgstr ""
 
-#: src/stored/acquire.c:324
+#: src/stored/acquire.c:328
 #, c-format
-msgid "Device %s is busy reading.\n"
+msgid "Want to append, but device %s is busy reading.\n"
 msgstr ""
 
-#: src/stored/acquire.c:354
+#: src/stored/acquire.c:358
 #, c-format
-msgid "Wanted Volume \"%s\", but device %s is busy writing on \"%s\" .\n"
+msgid ""
+"Wanted to append to Volume \"%s\", but device %s is busy writing on \"%s"
+"\" .\n"
 msgstr ""
 
-#: src/stored/acquire.c:373
+#: src/stored/acquire.c:377
 #, c-format
 msgid ""
 "Cannot recycle volume \"%s\" on device %s because it is in use by another "
 "job.\n"
 msgstr ""
 
-#: src/stored/acquire.c:395
+#: src/stored/acquire.c:402
+#, c-format
+msgid ""
+"Invalid tape position on volume \"%s\" on device %s. Expected %d, got %d\n"
+msgstr ""
+
+#: src/stored/acquire.c:422
 #, c-format
 msgid "Could not ready device %s for append.\n"
 msgstr ""
 
-#: src/stored/acquire.c:479 src/stored/block.c:366 src/stored/block.c:714
-#: src/stored/block.c:790
+#: src/stored/acquire.c:506 src/stored/block.c:367 src/stored/block.c:713
+#: src/stored/block.c:788
 #, c-format
 msgid "Could not create JobMedia record for Volume=\"%s\" Job=%s\n"
 msgstr ""
 
-#: src/stored/acquire.c:521
+#: src/stored/acquire.c:547
 #, c-format
 msgid "Alert: %s"
 msgstr ""
 
-#: src/stored/acquire.c:529
+#: src/stored/acquire.c:555
 #, c-format
 msgid "3997 Bad alert command: %s: ERR=%s.\n"
 msgstr ""
 
-#: src/stored/acquire.c:621
-#, c-format
-msgid "Hey! num_writers=%d!!!!\n"
-msgstr ""
-
 #: src/stored/ansi_label.c:96
 #, c-format
 msgid "Read error on device %s in ANSI label. ERR=%s\n"
@@ -9275,146 +9653,147 @@ msgstr ""
 msgid "write_ansi_ibm_label called for non-ANSI/IBM type\n"
 msgstr ""
 
-#: src/stored/append.c:63
+#: src/stored/append.c:64
 msgid "DCR is NULL!!!\n"
 msgstr ""
 
-#: src/stored/append.c:68
+#: src/stored/append.c:69
 msgid "DEVICE is NULL!!!\n"
 msgstr ""
 
-#: src/stored/append.c:80
+#: src/stored/append.c:81
 msgid "Unable to set network buffer size.\n"
 msgstr ""
 
-#: src/stored/append.c:93 src/stored/append.c:102 src/stored/append.c:114
-#: src/stored/append.c:291 src/stored/append.c:303 src/stored/askdir.c:307
-#: src/stored/askdir.c:308
+#: src/stored/append.c:94 src/stored/append.c:103 src/stored/append.c:115
+#: src/stored/append.c:298 src/stored/append.c:309 src/stored/askdir.c:332
+#: src/stored/askdir.c:333
 msgid "NULL Volume name. This shouldn't happen!!!\n"
 msgstr ""
 
-#: src/stored/append.c:108 src/stored/btape.c:1887
+#: src/stored/append.c:109 src/stored/btape.c:1889
 #, c-format
 msgid "Write session label failed. ERR=%s\n"
 msgstr ""
 
-#: src/stored/append.c:120
+#: src/stored/append.c:121
 #, c-format
 msgid "Network send error to FD. ERR=%s\n"
 msgstr ""
 
-#: src/stored/append.c:157
+#: src/stored/append.c:158
 #, c-format
 msgid "Error reading data header from FD. ERR=%s\n"
 msgstr ""
 
-#: src/stored/append.c:179
+#: src/stored/append.c:180
 #, c-format
 msgid "Malformed data header from FD: %s\n"
 msgstr ""
 
-#: src/stored/append.c:189
+#: src/stored/append.c:190
 msgid "File index from FD not positive or sequential\n"
 msgstr ""
 
-#: src/stored/append.c:243 src/stored/mac.c:241
+#: src/stored/append.c:244 src/stored/mac.c:248
 #, c-format
 msgid "Error updating file attributes. ERR=%s\n"
 msgstr ""
 
-#: src/stored/append.c:257
+#: src/stored/append.c:258
 #, c-format
 msgid "Network error on data channel. ERR=%s\n"
 msgstr ""
 
-#: src/stored/append.c:270
+#: src/stored/append.c:279
 #, c-format
 msgid ""
 "Job write elapsed time = %02d:%02d:%02d, Transfer rate = %s bytes/second\n"
 msgstr ""
 
-#: src/stored/append.c:285 src/stored/btape.c:2011
+#: src/stored/append.c:292 src/stored/btape.c:2013
 #, c-format
 msgid "Error writting end session label. ERR=%s\n"
 msgstr ""
 
-#: src/stored/append.c:296 src/stored/mac.c:122 src/stored/mac.c:213
-#: src/stored/spool.c:280
+#: src/stored/append.c:303 src/stored/mac.c:124 src/stored/mac.c:220
+#: src/stored/spool.c:293
 #, c-format
 msgid "Fatal append error on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/append.c:298 src/stored/mac.c:124
+#: src/stored/append.c:305 src/stored/mac.c:126
 msgid "Set ok=FALSE after write_block_to_device.\n"
 msgstr ""
 
-#: src/stored/askdir.c:171
+#: src/stored/askdir.c:178
 msgid "Network error on bnet_recv in req_vol_info.\n"
 msgstr ""
 
-#: src/stored/askdir.c:188
+#: src/stored/askdir.c:195
 #, c-format
 msgid "Error getting Volume info: %s"
 msgstr ""
 
-#: src/stored/askdir.c:312 src/stored/askdir.c:313
-msgid "Attempt to update_volume_info in read mode!!!\n"
-msgstr ""
-
-#: src/stored/askdir.c:341
+#: src/stored/askdir.c:363
 #, c-format
 msgid "Didn't get vol info vol=%s: ERR=%s"
 msgstr ""
 
-#: src/stored/askdir.c:379
+#: src/stored/askdir.c:405
 #, c-format
 msgid "Error creating JobMedia record: ERR=%s\n"
 msgstr ""
 
-#: src/stored/askdir.c:386
+#: src/stored/askdir.c:412
 #, c-format
 msgid "Error creating JobMedia record: %s\n"
 msgstr ""
 
-#: src/stored/askdir.c:452
+#: src/stored/askdir.c:478
 #, c-format
 msgid "Job %s canceled while waiting for mount on Storage Device \"%s\".\n"
 msgstr ""
 
-#: src/stored/askdir.c:465
+#: src/stored/askdir.c:491
 #, c-format
 msgid ""
 "Job %s waiting. Cannot find any appendable volumes.\n"
 "Please use the \"label\"  command to create a new Volume for:\n"
 "    Storage:      %s\n"
-"    Media type:   %s\n"
 "    Pool:         %s\n"
+"    Media type:   %s\n"
 msgstr ""
 
-#: src/stored/askdir.c:489 src/stored/askdir.c:571
+#: src/stored/askdir.c:515 src/stored/askdir.c:605
 #, c-format
 msgid "Max time exceeded waiting to mount Storage Device %s for Job %s\n"
 msgstr ""
 
-#: src/stored/askdir.c:499
+#: src/stored/askdir.c:525
 msgid "pthread error in mount_next_volume.\n"
 msgstr ""
 
-#: src/stored/askdir.c:531
+#: src/stored/askdir.c:557
 msgid "Cannot request another volume: no volume name given.\n"
 msgstr ""
 
-#: src/stored/askdir.c:537
+#: src/stored/askdir.c:563
 #, c-format
 msgid "Job %s canceled while waiting for mount on Storage Device %s.\n"
 msgstr ""
 
-#: src/stored/askdir.c:552
+#: src/stored/askdir.c:578
 #, c-format
-msgid "Please mount Volume \"%s\" on Storage Device %s for Job %s\n"
+msgid ""
+"Please mount Volume \"%s\" or label a new one for:\n"
+"    Job:          %s\n"
+"    Storage:      %s\n"
+"    Pool:         %s\n"
+"    Media type:   %s\n"
 msgstr ""
 
-#: src/stored/askdir.c:581
+#: src/stored/askdir.c:615
 msgid "pthread error in mount_volume\n"
 msgstr ""
 
@@ -9467,103 +9846,102 @@ msgid ""
 "Media Type not the same for all devices in changer %s. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:143
+#: src/stored/autochanger.c:149
 #, c-format
-msgid "Invalid slot=%d defined, cannot autoload Volume.\n"
+msgid ""
+"Invalid slot=%d defined in catalog for Volume \"%s\" on %s. Manual load my "
+"be required.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:146
-msgid "No \"Changer Device\" given cannot autoload Volume.\n"
+#: src/stored/autochanger.c:154
+#, c-format
+msgid "No \"Changer Device\" for %s. Manual load of Volume may be required.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:149
-msgid "No \"Changer Command\" given cannot autoload Volume.\n"
+#: src/stored/autochanger.c:158
+#, c-format
+msgid "No \"Changer Command\" for %s. Manual load of Volume may be requird.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:178
+#: src/stored/autochanger.c:188
 #, c-format
 msgid "3304 Issuing autochanger \"load slot %d, drive %d\" command.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:186
+#: src/stored/autochanger.c:196
 #, c-format
 msgid "3305 Autochanger \"load slot %d, drive %d\", status is OK.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:195
+#: src/stored/autochanger.c:205
 #, c-format
 msgid ""
 "3992 Bad autochanger \"load slot %d, drive %d\": ERR=%s.\n"
 "Results=%s\n"
 msgstr ""
 
-#: src/stored/autochanger.c:241
+#: src/stored/autochanger.c:251
 msgid "3992 Missing Changer command.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:251
+#: src/stored/autochanger.c:265
 #, c-format
 msgid "3301 Issuing autochanger \"loaded? drive %d\" command.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:261
+#: src/stored/autochanger.c:275
 #, c-format
 msgid "3302 Autochanger \"loaded? drive %d\", result is Slot %d.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:265
+#: src/stored/autochanger.c:279
 #, c-format
 msgid "3302 Autochanger \"loaded? drive %d\", result: nothing loaded.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:272
+#: src/stored/autochanger.c:286
 #, c-format
 msgid ""
 "3991 Bad autochanger \"loaded? drive %d\" command: ERR=%s.\n"
 "Results=%s\n"
 msgstr ""
 
-#: src/stored/autochanger.c:331 src/stored/autochanger.c:422
+#: src/stored/autochanger.c:345 src/stored/autochanger.c:436
 #, c-format
 msgid "3307 Issuing autochanger \"unload slot %d, drive %d\" command.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:345
+#: src/stored/autochanger.c:359
 #, c-format
 msgid ""
 "3995 Bad autochanger \"unload slot %d, drive %d\": ERR=%s\n"
 "Results=%s\n"
 msgstr ""
 
-#: src/stored/autochanger.c:409
+#: src/stored/autochanger.c:423
 #, c-format
 msgid "Volume \"%s\" is in use by device %s\n"
 msgstr ""
 
-#: src/stored/autochanger.c:444
+#: src/stored/autochanger.c:458
 #, c-format
 msgid "3995 Bad autochanger \"unload slot %d, drive %d\": ERR=%s.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:483
+#: src/stored/autochanger.c:498
 #, c-format
 msgid "3993 Device %s not an autochanger device.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:504
+#: src/stored/autochanger.c:519
 #, c-format
 msgid "3306 Issuing autochanger \"%s\" command.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:507
+#: src/stored/autochanger.c:522
 msgid "3996 Open bpipe failed.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:534
-#, c-format
-msgid "Autochanger error: ERR=%s\n"
-msgstr ""
-
 #: src/stored/bcopy.c:72
 #, c-format
 msgid ""
@@ -9587,7 +9965,7 @@ msgstr ""
 msgid "Wrong number of arguments: \n"
 msgstr ""
 
-#: src/stored/bcopy.c:191 src/stored/btape.c:363 src/stored/device.c:277
+#: src/stored/bcopy.c:191 src/stored/btape.c:364 src/stored/device.c:296
 #, c-format
 msgid "dev open failed: %s\n"
 msgstr ""
@@ -9601,7 +9979,7 @@ msgstr ""
 msgid "%u Jobs copied. %u records copied.\n"
 msgstr ""
 
-#: src/stored/bcopy.c:224 src/stored/bscan.c:398
+#: src/stored/bcopy.c:224 src/stored/bscan.c:402
 #, c-format
 msgid "Record: SessId=%u SessTim=%u FileIndex=%d Stream=%d len=%u\n"
 msgstr ""
@@ -9615,7 +9993,7 @@ msgid "Volume label not copied.\n"
 msgstr ""
 
 #: src/stored/bcopy.c:254 src/stored/bcopy.c:261 src/stored/bcopy.c:284
-#: src/stored/btape.c:2384
+#: src/stored/btape.c:2386
 #, c-format
 msgid "Cannot fixup device error. %s\n"
 msgstr ""
@@ -9629,7 +10007,7 @@ msgid "EOT label not copied.\n"
 msgstr ""
 
 #: src/stored/bcopy.c:305 src/stored/bextract.c:489 src/stored/bls.c:452
-#: src/stored/bscan.c:1280 src/stored/btape.c:2683
+#: src/stored/bscan.c:1283 src/stored/btape.c:2685
 #, c-format
 msgid "Mount Volume \"%s\" on device %s and press return when ready: "
 msgstr ""
@@ -9693,7 +10071,7 @@ msgstr ""
 msgid "Logic error output file should be open but is not.\n"
 msgstr ""
 
-#: src/stored/bextract.c:298 src/stored/bls.c:376 src/stored/bscan.c:655
+#: src/stored/bextract.c:298 src/stored/bls.c:376 src/stored/bscan.c:659
 msgid "Cannot continue.\n"
 msgstr ""
 
@@ -9753,142 +10131,142 @@ msgid ""
 "Block checksum mismatch in block=%u len=%d: calc=%x blk=%x\n"
 msgstr ""
 
-#: src/stored/block.c:423
+#: src/stored/block.c:425
 msgid "Cannot write block. Device at EOM.\n"
 msgstr ""
 
-#: src/stored/block.c:428
+#: src/stored/block.c:430
 msgid "Attempt to write on read-only Volume.\n"
 msgstr ""
 
-#: src/stored/block.c:480
+#: src/stored/block.c:482
 #, c-format
 msgid "User defined maximum volume capacity %s exceeded on device %s.\n"
 msgstr ""
 
-#: src/stored/block.c:495
+#: src/stored/block.c:497
 #, c-format
 msgid "Unable to write EOF. ERR=%s\n"
 msgstr ""
 
-#: src/stored/block.c:521 src/stored/block.c:549
+#: src/stored/block.c:523 src/stored/block.c:548
 msgid "Write block header zeroed.\n"
 msgstr ""
 
-#: src/stored/block.c:568
+#: src/stored/block.c:567
 #, c-format
 msgid "Write error at %u:%u on device %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/block.c:575
+#: src/stored/block.c:574
 #, c-format
 msgid "End of Volume \"%s\" at %u:%u on device %s. Write of %u bytes got %d.\n"
 msgstr ""
 
-#: src/stored/block.c:651 src/stored/block.c:657
+#: src/stored/block.c:650 src/stored/block.c:656
 #, c-format
 msgid "Backspace file at EOT failed. ERR=%s\n"
 msgstr ""
 
-#: src/stored/block.c:664
+#: src/stored/block.c:663
 #, c-format
 msgid "Backspace record at EOT failed. ERR=%s\n"
 msgstr ""
 
-#: src/stored/block.c:681
+#: src/stored/block.c:680
 #, c-format
 msgid "Re-read last block at EOT failed. ERR=%s"
 msgstr ""
 
-#: src/stored/block.c:691
+#: src/stored/block.c:690
 #, c-format
 msgid ""
 "Re-read of last block OK, but block numbers differ. Last block=%u Current "
 "block=%u.\n"
 msgstr ""
 
-#: src/stored/block.c:694
+#: src/stored/block.c:693
 msgid "Re-read of last block succeeded.\n"
 msgstr ""
 
-#: src/stored/block.c:722
+#: src/stored/block.c:721
 #, c-format
 msgid ""
 "Error writing final EOF to tape. This Volume may not be readable.\n"
 "%s"
 msgstr ""
 
-#: src/stored/block.c:737
+#: src/stored/block.c:735
 #, c-format
 msgid ""
 "Error writing final part to DVD. This Volume may not be readable.\n"
 "%s"
 msgstr ""
 
-#: src/stored/block.c:839
+#: src/stored/block.c:837
 #, c-format
 msgid ""
 "Error while writing, current part number is less than the total number of "
 "parts (%d/%d, device=%s)\n"
 msgstr ""
 
-#: src/stored/block.c:847
+#: src/stored/block.c:845
 #, c-format
 msgid "Unable to open device next part %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/block.c:867
+#: src/stored/block.c:865
 #, c-format
 msgid ""
 "End of Volume \"%s\" at %u:%u on device %s (part_size=%s, free_space=%s, "
 "free_space_errno=%d, errmsg=%s).\n"
 msgstr ""
 
-#: src/stored/block.c:880
+#: src/stored/block.c:878
 #, c-format
 msgid ""
 "End of Volume \"%s\" at %u:%u on device %s (part_size=%s, free_space=%s, "
 "free_space_errno=%d).\n"
 msgstr ""
 
-#: src/stored/block.c:936
+#: src/stored/block.c:934
 #, c-format
 msgid "Block buffer size looping problem on device %s\n"
 msgstr ""
 
-#: src/stored/block.c:964
+#: src/stored/block.c:962
 #, c-format
 msgid "Unable to open device part=%d %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/block.c:993
+#: src/stored/block.c:988
 #, c-format
 msgid "Read error on fd=%d at file:blk %u:%u on device %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/block.c:1006
+#: src/stored/block.c:1001
 #, c-format
 msgid "Read zero bytes at %u:%u on device %s.\n"
 msgstr ""
 
-#: src/stored/block.c:1019
+#: src/stored/block.c:1014
 #, c-format
 msgid ""
 "Volume data error at %u:%u! Very short block of %d bytes on device %s "
 "discarded.\n"
 msgstr ""
 
-#: src/stored/block.c:1044
+#: src/stored/block.c:1039
 #, c-format
 msgid "Block length %u is greater than buffer %u. Attempting recovery.\n"
 msgstr ""
 
-#: src/stored/block.c:1063
+#: src/stored/block.c:1058
 #, c-format
 msgid "Setting block buffer size to %u bytes.\n"
 msgstr ""
 
-#: src/stored/block.c:1078
+#: src/stored/block.c:1073
 #, c-format
 msgid ""
 "Volume data error at %u:%u! Short block of %d bytes on device %s discarded.\n"
@@ -9960,19 +10338,19 @@ msgstr ""
 msgid "FileIndex=%d VolSessionId=%d VolSessionTime=%d Stream=%d DataLen=%d\n"
 msgstr ""
 
-#: src/stored/bls.c:409 src/stored/read_record.c:387
+#: src/stored/bls.c:409 src/stored/read_record.c:388
 msgid "Fresh Volume Label"
 msgstr ""
 
-#: src/stored/bls.c:412 src/stored/read_record.c:390
+#: src/stored/bls.c:412 src/stored/read_record.c:391
 msgid "Volume Label"
 msgstr ""
 
-#: src/stored/bls.c:416 src/stored/label.c:1024
+#: src/stored/bls.c:416 src/stored/label.c:1031
 msgid "Begin Job Session"
 msgstr ""
 
-#: src/stored/bls.c:420 src/stored/label.c:1027
+#: src/stored/bls.c:420 src/stored/label.c:1034
 msgid "End Job Session"
 msgstr ""
 
@@ -9980,11 +10358,11 @@ msgstr ""
 msgid "End of Medium"
 msgstr ""
 
-#: src/stored/bls.c:427 src/stored/label.c:1036
+#: src/stored/bls.c:427 src/stored/label.c:1043
 msgid "Unknown"
 msgstr ""
 
-#: src/stored/bls.c:433 src/stored/read_record.c:408
+#: src/stored/bls.c:433 src/stored/read_record.c:409
 #, c-format
 msgid "%s Record: VolSessionId=%d VolSessionTime=%d JobId=%d DataLen=%d\n"
 msgstr ""
@@ -10015,12 +10393,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/stored/bscan.c:241 src/stored/stored.c:286
+#: src/stored/bscan.c:241 src/stored/stored.c:288
 #, c-format
 msgid "No Storage resource defined in %s. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/bscan.c:249 src/stored/stored.c:317
+#: src/stored/bscan.c:249 src/stored/stored.c:319
 #, c-format
 msgid "No Working Directory defined in %s. Cannot continue.\n"
 msgstr ""
@@ -10035,7 +10413,7 @@ msgstr ""
 msgid "Working Directory: %s is not a directory. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/bscan.c:275 src/stored/bscan.c:348
+#: src/stored/bscan.c:275 src/stored/bscan.c:349
 #, c-format
 msgid "First Volume Size = %sn"
 msgstr ""
@@ -10049,254 +10427,254 @@ msgstr ""
 msgid "Using Database: %s, User: %s\n"
 msgstr ""
 
-#: src/stored/bscan.c:322
+#: src/stored/bscan.c:323
 #, c-format
 msgid "Create JobMedia for Job %s\n"
 msgstr ""
 
-#: src/stored/bscan.c:333
+#: src/stored/bscan.c:331
 #, c-format
 msgid "Could not create JobMedia record for Volume=%s Job=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:390
+#: src/stored/bscan.c:394
 #, c-format
 msgid "done: %d%%\n"
 msgstr ""
 
-#: src/stored/bscan.c:414
+#: src/stored/bscan.c:418
 msgid "Volume is prelabeled. This tape cannot be scanned.\n"
 msgstr ""
 
-#: src/stored/bscan.c:426
+#: src/stored/bscan.c:430
 #, c-format
 msgid "Pool record for %s found in DB.\n"
 msgstr ""
 
-#: src/stored/bscan.c:430
+#: src/stored/bscan.c:434
 #, c-format
 msgid "VOL_LABEL: Pool record not found for Pool: %s\n"
 msgstr ""
 
-#: src/stored/bscan.c:436
+#: src/stored/bscan.c:440
 #, c-format
 msgid "VOL_LABEL: PoolType mismatch. DB=%s Vol=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:440
+#: src/stored/bscan.c:444
 #, c-format
 msgid "Pool type \"%s\" is OK.\n"
 msgstr ""
 
-#: src/stored/bscan.c:450
+#: src/stored/bscan.c:454
 #, c-format
 msgid "Media record for %s found in DB.\n"
 msgstr ""
 
-#: src/stored/bscan.c:457
+#: src/stored/bscan.c:461
 #, c-format
 msgid "VOL_LABEL: Media record not found for Volume: %s\n"
 msgstr ""
 
-#: src/stored/bscan.c:464
+#: src/stored/bscan.c:468
 #, c-format
 msgid "VOL_LABEL: MediaType mismatch. DB=%s Vol=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:468
+#: src/stored/bscan.c:472
 #, c-format
 msgid "Media type \"%s\" is OK.\n"
 msgstr ""
 
-#: src/stored/bscan.c:477
+#: src/stored/bscan.c:481
 #, c-format
 msgid "VOL_LABEL: OK for Volume: %s\n"
 msgstr ""
 
-#: src/stored/bscan.c:484
+#: src/stored/bscan.c:488
 #, c-format
 msgid "%d \"errors\" ignored before first Start of Session record.\n"
 msgstr ""
 
-#: src/stored/bscan.c:495
+#: src/stored/bscan.c:499
 #, c-format
 msgid "SOS_LABEL: Found Job record for JobId: %d\n"
 msgstr ""
 
-#: src/stored/bscan.c:500
+#: src/stored/bscan.c:504
 #, c-format
 msgid "SOS_LABEL: Job record not found for JobId: %d\n"
 msgstr ""
 
-#: src/stored/bscan.c:540
+#: src/stored/bscan.c:544
 #, c-format
 msgid "SOS_LABEL: VolSessId mismatch for JobId=%u. DB=%d Vol=%d\n"
 msgstr ""
 
-#: src/stored/bscan.c:546
+#: src/stored/bscan.c:550
 #, c-format
 msgid "SOS_LABEL: VolSessTime mismatch for JobId=%u. DB=%d Vol=%d\n"
 msgstr ""
 
-#: src/stored/bscan.c:552
+#: src/stored/bscan.c:556
 #, c-format
 msgid "SOS_LABEL: PoolId mismatch for JobId=%u. DB=%d Vol=%d\n"
 msgstr ""
 
-#: src/stored/bscan.c:570 src/stored/bscan.c:1067
+#: src/stored/bscan.c:574 src/stored/bscan.c:1077
 #, c-format
 msgid "Could not find SessId=%d SessTime=%d for EOS record.\n"
 msgstr ""
 
-#: src/stored/bscan.c:614
+#: src/stored/bscan.c:618
 #, c-format
 msgid "Could not update job record. ERR=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:625
+#: src/stored/bscan.c:629
 #, c-format
 msgid "End of all Volumes. VolFiles=%u VolBlocks=%u VolBytes=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:637
+#: src/stored/bscan.c:641
 #, c-format
 msgid "Could not find Job for SessId=%d SessTime=%d record.\n"
 msgstr ""
 
-#: src/stored/bscan.c:673
+#: src/stored/bscan.c:677
 #, c-format
 msgid "%s file records. At file:blk=%s:%s bytes=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:727
+#: src/stored/bscan.c:731
 #, c-format
 msgid "Got MD5 record: %s\n"
 msgstr ""
 
-#: src/stored/bscan.c:735
+#: src/stored/bscan.c:739
 #, c-format
 msgid "Got SHA1 record: %s\n"
 msgstr ""
 
-#: src/stored/bscan.c:743
+#: src/stored/bscan.c:747
 #, c-format
 msgid "Got SHA256 record: %s\n"
 msgstr ""
 
-#: src/stored/bscan.c:751
+#: src/stored/bscan.c:755
 #, c-format
 msgid "Got SHA512 record: %s\n"
 msgstr ""
 
-#: src/stored/bscan.c:759 src/stored/bscan.c:766
+#: src/stored/bscan.c:763 src/stored/bscan.c:770
 msgid "Got signed digest record\n"
 msgstr ""
 
-#: src/stored/bscan.c:772
+#: src/stored/bscan.c:776
 #, c-format
 msgid "Got Prog Names Stream: %s\n"
 msgstr ""
 
-#: src/stored/bscan.c:778
+#: src/stored/bscan.c:782
 msgid "Got Prog Data Stream record.\n"
 msgstr ""
 
-#: src/stored/bscan.c:788
+#: src/stored/bscan.c:792
 #, c-format
 msgid "Unknown stream type!!! stream=%d len=%i\n"
 msgstr ""
 
-#: src/stored/bscan.c:852
+#: src/stored/bscan.c:856
 #, c-format
 msgid "Could not create File Attributes record. ERR=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:858
+#: src/stored/bscan.c:862
 #, c-format
 msgid "Created File record: %s\n"
 msgstr ""
 
-#: src/stored/bscan.c:896
+#: src/stored/bscan.c:906
 #, c-format
 msgid "Could not create media record. ERR=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:900 src/stored/bscan.c:921
+#: src/stored/bscan.c:910 src/stored/bscan.c:931
 #, c-format
 msgid "Could not update media record. ERR=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:904
+#: src/stored/bscan.c:914
 #, c-format
 msgid "Created Media record for Volume: %s\n"
 msgstr ""
 
-#: src/stored/bscan.c:925
+#: src/stored/bscan.c:935
 #, c-format
 msgid "Updated Media record at end of Volume: %s\n"
 msgstr ""
 
-#: src/stored/bscan.c:942
+#: src/stored/bscan.c:952
 #, c-format
 msgid "Could not create pool record. ERR=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:946
+#: src/stored/bscan.c:956
 #, c-format
 msgid "Created Pool record for Pool: %s\n"
 msgstr ""
 
-#: src/stored/bscan.c:966
+#: src/stored/bscan.c:976
 #, c-format
 msgid "Created Client record for Client: %s\n"
 msgstr ""
 
-#: src/stored/bscan.c:983
+#: src/stored/bscan.c:993
 #, c-format
 msgid "Fileset \"%s\" already exists.\n"
 msgstr ""
 
-#: src/stored/bscan.c:987
+#: src/stored/bscan.c:997
 #, c-format
 msgid "Could not create FileSet record \"%s\". ERR=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:992
+#: src/stored/bscan.c:1002
 #, c-format
 msgid "Created FileSet record \"%s\"\n"
 msgstr ""
 
-#: src/stored/bscan.c:1039
+#: src/stored/bscan.c:1049
 #, c-format
 msgid "Could not create JobId record. ERR=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:1045
+#: src/stored/bscan.c:1055
 #, c-format
 msgid "Could not update job start record. ERR=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:1048
+#: src/stored/bscan.c:1058
 #, c-format
 msgid "Created new JobId=%u record for original JobId=%u\n"
 msgstr ""
 
-#: src/stored/bscan.c:1098
+#: src/stored/bscan.c:1108
 #, c-format
 msgid "Could not update JobId=%u record. ERR=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:1103
+#: src/stored/bscan.c:1113
 #, c-format
 msgid "Updated Job termination record for JobId=%u Level=%s TermStat=%c\n"
 msgstr ""
 
-#: src/stored/bscan.c:1125
+#: src/stored/bscan.c:1135
 #, c-format
 msgid "Job Termination code: %d"
 msgstr ""
 
-#: src/stored/bscan.c:1130
+#: src/stored/bscan.c:1140
 #, c-format
 msgid ""
 "%s\n"
@@ -10316,36 +10694,36 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/stored/bscan.c:1194
+#: src/stored/bscan.c:1197
 #, c-format
 msgid "Could not create JobMedia record. ERR=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:1198
+#: src/stored/bscan.c:1201
 #, c-format
 msgid "Created JobMedia record JobId %d, MediaId %d\n"
 msgstr ""
 
-#: src/stored/bscan.c:1214
+#: src/stored/bscan.c:1217
 #, c-format
 msgid "Could not find SessId=%d SessTime=%d for MD5/SHA1 record.\n"
 msgstr ""
 
-#: src/stored/bscan.c:1228
+#: src/stored/bscan.c:1231
 #, c-format
 msgid "Could not add MD5/SHA1 to File record. ERR=%s\n"
 msgstr ""
 
-#: src/stored/bscan.c:1233
+#: src/stored/bscan.c:1236
 msgid "Updated MD5/SHA1 record\n"
 msgstr ""
 
-#: src/stored/btape.c:172 src/stored/stored.c:126
+#: src/stored/btape.c:172 src/stored/stored.c:128
 #, c-format
 msgid "Tape block size (%d) not multiple of system size (%d)\n"
 msgstr ""
 
-#: src/stored/btape.c:176 src/stored/stored.c:130
+#: src/stored/btape.c:176 src/stored/stored.c:132
 #, c-format
 msgid "Tape block size (%d) is not a power of 2\n"
 msgstr ""
@@ -10370,6 +10748,10 @@ msgstr ""
 msgid "64 bit printf/scanf problem. i=%d x64=%"
 msgstr ""
 
+#: src/stored/btape.c:195
+msgid " y64=%"
+msgstr ""
+
 #: src/stored/btape.c:200
 #, c-format
 msgid "Tape block granularity is %d bytes.\n"
@@ -10396,135 +10778,135 @@ msgstr ""
 msgid "open device %s: OK\n"
 msgstr ""
 
-#: src/stored/btape.c:389
+#: src/stored/btape.c:391
 msgid "Enter Volume Name: "
 msgstr ""
 
-#: src/stored/btape.c:396
+#: src/stored/btape.c:398
 #, c-format
 msgid "Device open failed. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:402
+#: src/stored/btape.c:404
 #, c-format
 msgid "Wrote Volume label for volume \"%s\".\n"
 msgstr ""
 
-#: src/stored/btape.c:416
+#: src/stored/btape.c:418
 msgid "Volume has no label.\n"
 msgstr ""
 
-#: src/stored/btape.c:419
+#: src/stored/btape.c:421
 msgid "Volume label read correctly.\n"
 msgstr ""
 
-#: src/stored/btape.c:422
+#: src/stored/btape.c:424
 #, c-format
 msgid "I/O error on device: ERR=%s"
 msgstr ""
 
-#: src/stored/btape.c:425
+#: src/stored/btape.c:427
 msgid "Volume name error\n"
 msgstr ""
 
-#: src/stored/btape.c:428
+#: src/stored/btape.c:430
 #, c-format
 msgid "Error creating label. ERR=%s"
 msgstr ""
 
-#: src/stored/btape.c:431
+#: src/stored/btape.c:433
 msgid "Volume version error.\n"
 msgstr ""
 
-#: src/stored/btape.c:434
+#: src/stored/btape.c:436
 msgid "Bad Volume label type.\n"
 msgstr ""
 
-#: src/stored/btape.c:437
+#: src/stored/btape.c:439
 msgid "Unknown error.\n"
 msgstr ""
 
-#: src/stored/btape.c:455
+#: src/stored/btape.c:457
 #, c-format
 msgid "Bad status from load. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:457
+#: src/stored/btape.c:459
 #, c-format
 msgid "Loaded %s\n"
 msgstr ""
 
-#: src/stored/btape.c:466 src/stored/btape.c:805 src/stored/btape.c:847
-#: src/stored/btape.c:917 src/stored/btape.c:959 src/stored/btape.c:1227
+#: src/stored/btape.c:468 src/stored/btape.c:807 src/stored/btape.c:849
+#: src/stored/btape.c:919 src/stored/btape.c:961 src/stored/btape.c:1229
 #, c-format
 msgid "Bad status from rewind. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:469 src/stored/btape.c:1235
+#: src/stored/btape.c:471 src/stored/btape.c:1237
 #, c-format
 msgid "Rewound %s\n"
 msgstr ""
 
-#: src/stored/btape.c:495 src/stored/btape.c:1239
+#: src/stored/btape.c:497 src/stored/btape.c:1241
 #, c-format
 msgid "Bad status from weof. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:499
+#: src/stored/btape.c:501
 #, c-format
 msgid "Wrote 1 EOF to %s\n"
 msgstr ""
 
-#: src/stored/btape.c:502
+#: src/stored/btape.c:504
 #, c-format
 msgid "Wrote %d EOFs to %s\n"
 msgstr ""
 
-#: src/stored/btape.c:520
+#: src/stored/btape.c:522
 msgid "Moved to end of medium.\n"
 msgstr ""
 
-#: src/stored/btape.c:547
+#: src/stored/btape.c:549
 #, c-format
 msgid "Bad status from bsf. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:549
+#: src/stored/btape.c:551
 #, c-format
 msgid "Backspaced %d file%s.\n"
 msgstr ""
 
-#: src/stored/btape.c:566
+#: src/stored/btape.c:568
 #, c-format
 msgid "Bad status from bsr. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:568
+#: src/stored/btape.c:570
 #, c-format
 msgid "Backspaced %d record%s.\n"
 msgstr ""
 
-#: src/stored/btape.c:578 src/stored/status.c:279
+#: src/stored/btape.c:580 src/stored/status.c:302
 #, c-format
 msgid "Configured device capabilities:\n"
 msgstr ""
 
-#: src/stored/btape.c:596
+#: src/stored/btape.c:598
 #, c-format
 msgid "Device status:\n"
 msgstr ""
 
-#: src/stored/btape.c:610 src/stored/status.c:318
+#: src/stored/btape.c:612 src/stored/status.c:341
 #, c-format
 msgid "Device parameters:\n"
 msgstr ""
 
-#: src/stored/btape.c:615
+#: src/stored/btape.c:617
 #, c-format
 msgid "Status:\n"
 msgstr ""
 
-#: src/stored/btape.c:630
+#: src/stored/btape.c:632
 msgid ""
 "Test writting larger and larger records.\n"
 "This is a torture test for records.\n"
@@ -10533,24 +10915,24 @@ msgid ""
 "plus the header exceeds the block size (by default about 64K)\n"
 msgstr ""
 
-#: src/stored/btape.c:636
+#: src/stored/btape.c:638
 msgid "Do you want to continue? (y/n): "
 msgstr ""
 
-#: src/stored/btape.c:638 src/stored/btape.c:1855
+#: src/stored/btape.c:640 src/stored/btape.c:1857
 msgid "Command aborted.\n"
 msgstr ""
 
-#: src/stored/btape.c:654
+#: src/stored/btape.c:656
 #, c-format
 msgid "Block %d i=%d\n"
 msgstr ""
 
-#: src/stored/btape.c:680
+#: src/stored/btape.c:682
 msgid "Skipping read backwards test because BSR turned off.\n"
 msgstr ""
 
-#: src/stored/btape.c:684
+#: src/stored/btape.c:686
 msgid ""
 "\n"
 "=== Write, backup, and re-read test ===\n"
@@ -10564,73 +10946,73 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:697 src/stored/btape.c:708 src/stored/btape.c:719
-#: src/stored/btape.c:817 src/stored/btape.c:833 src/stored/btape.c:929
-#: src/stored/btape.c:945 src/stored/btape.c:1564 src/stored/btape.c:2449
+#: src/stored/btape.c:699 src/stored/btape.c:710 src/stored/btape.c:721
+#: src/stored/btape.c:819 src/stored/btape.c:835 src/stored/btape.c:931
+#: src/stored/btape.c:947 src/stored/btape.c:1566 src/stored/btape.c:2451
 msgid "Error writing record to block.\n"
 msgstr ""
 
-#: src/stored/btape.c:701 src/stored/btape.c:712 src/stored/btape.c:723
-#: src/stored/btape.c:821 src/stored/btape.c:837 src/stored/btape.c:933
-#: src/stored/btape.c:949 src/stored/btape.c:1568 src/stored/btape.c:2453
+#: src/stored/btape.c:703 src/stored/btape.c:714 src/stored/btape.c:725
+#: src/stored/btape.c:823 src/stored/btape.c:839 src/stored/btape.c:935
+#: src/stored/btape.c:951 src/stored/btape.c:1570 src/stored/btape.c:2455
 msgid "Error writing block to device.\n"
 msgstr ""
 
-#: src/stored/btape.c:704
+#: src/stored/btape.c:706
 #, c-format
 msgid "Wrote first record of %d bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:715
+#: src/stored/btape.c:717
 #, c-format
 msgid "Wrote second record of %d bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:726
+#: src/stored/btape.c:728
 #, c-format
 msgid "Wrote third record of %d bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:733 src/stored/btape.c:738
+#: src/stored/btape.c:735 src/stored/btape.c:740
 #, c-format
 msgid "Backspace file failed! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:742
+#: src/stored/btape.c:744
 msgid "Backspaced over EOF OK.\n"
 msgstr ""
 
-#: src/stored/btape.c:744
+#: src/stored/btape.c:746
 #, c-format
 msgid "Backspace record failed! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:747
+#: src/stored/btape.c:749
 msgid "Backspace record OK.\n"
 msgstr ""
 
-#: src/stored/btape.c:750 src/stored/btape.c:756
+#: src/stored/btape.c:752 src/stored/btape.c:758
 #, c-format
 msgid "Read block failed! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:761
+#: src/stored/btape.c:763
 msgid "Bad data in record. Test failed!\n"
 msgstr ""
 
-#: src/stored/btape.c:765
+#: src/stored/btape.c:767
 msgid ""
 "\n"
 "Block re-read correct. Test succeeded!\n"
 msgstr ""
 
-#: src/stored/btape.c:766
+#: src/stored/btape.c:768
 msgid ""
 "=== End Write, backup, and re-read test ===\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:773
+#: src/stored/btape.c:775
 msgid ""
 "This is not terribly serious since Bacula only uses\n"
 "this function to verify the last block written to the\n"
@@ -10642,7 +11024,7 @@ msgid ""
 "to your Storage daemon's Device resource definition.\n"
 msgstr ""
 
-#: src/stored/btape.c:797
+#: src/stored/btape.c:799
 msgid ""
 "\n"
 "=== Write, rewind, and re-read test ===\n"
@@ -10655,46 +11037,46 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:825 src/stored/btape.c:841 src/stored/btape.c:937
-#: src/stored/btape.c:953
+#: src/stored/btape.c:827 src/stored/btape.c:843 src/stored/btape.c:939
+#: src/stored/btape.c:955
 #, c-format
 msgid "Wrote 1000 blocks of %d bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:850 src/stored/btape.c:962
+#: src/stored/btape.c:852 src/stored/btape.c:964
 msgid "Rewind OK.\n"
 msgstr ""
 
-#: src/stored/btape.c:857 src/stored/btape.c:1011
+#: src/stored/btape.c:859 src/stored/btape.c:1013
 msgid "Got EOF on tape.\n"
 msgstr ""
 
-#: src/stored/btape.c:862
+#: src/stored/btape.c:864
 #, c-format
 msgid "Read block %d failed! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:868
+#: src/stored/btape.c:870
 #, c-format
 msgid "Read record failed. Block %d! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:874 src/stored/btape.c:1041
+#: src/stored/btape.c:876 src/stored/btape.c:1043
 #, c-format
 msgid "Bad data in record. Expected %d, got %d at byte %d. Test failed!\n"
 msgstr ""
 
-#: src/stored/btape.c:881
+#: src/stored/btape.c:883
 msgid "1000 blocks re-read correctly.\n"
 msgstr ""
 
-#: src/stored/btape.c:884 src/stored/btape.c:1048
+#: src/stored/btape.c:886 src/stored/btape.c:1050
 msgid ""
 "=== Test Succeeded. End Write, rewind, and re-read test ===\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:909
+#: src/stored/btape.c:911
 msgid ""
 "\n"
 "=== Write, rewind, and position test ===\n"
@@ -10707,23 +11089,23 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1002
+#: src/stored/btape.c:1004
 #, c-format
 msgid "Reposition to file:block %d:%d\n"
 msgstr ""
 
-#: src/stored/btape.c:1004
+#: src/stored/btape.c:1006
 msgid "Reposition error.\n"
 msgstr ""
 
-#: src/stored/btape.c:1017
+#: src/stored/btape.c:1019
 #, c-format
 msgid ""
 "Read block %d failed! file=%d blk=%d. ERR=%s\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1019
+#: src/stored/btape.c:1021
 msgid ""
 "This may be because the tape drive block size is not\n"
 " set to variable blocking as normally used by Bacula.\n"
@@ -10737,17 +11119,17 @@ msgid ""
 " in your Device resource.\n"
 msgstr ""
 
-#: src/stored/btape.c:1035
+#: src/stored/btape.c:1037
 #, c-format
 msgid "Read record failed! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1046
+#: src/stored/btape.c:1048
 #, c-format
 msgid "Block %d re-read correctly.\n"
 msgstr ""
 
-#: src/stored/btape.c:1067
+#: src/stored/btape.c:1069
 msgid ""
 "\n"
 "\n"
@@ -10761,58 +11143,58 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1091
+#: src/stored/btape.c:1093
 msgid "Now moving to end of medium.\n"
 msgstr ""
 
-#: src/stored/btape.c:1093 src/stored/btape.c:1322
+#: src/stored/btape.c:1095 src/stored/btape.c:1324
 #, c-format
 msgid "We should be in file 3. I am at file %d. %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1094 src/stored/btape.c:1112 src/stored/btape.c:1311
-#: src/stored/btape.c:1323 src/stored/btape.c:1336 src/stored/btape.c:1353
+#: src/stored/btape.c:1096 src/stored/btape.c:1114 src/stored/btape.c:1313
+#: src/stored/btape.c:1325 src/stored/btape.c:1338 src/stored/btape.c:1355
 msgid "This is correct!"
 msgstr ""
 
-#: src/stored/btape.c:1094 src/stored/btape.c:1112 src/stored/btape.c:1311
-#: src/stored/btape.c:1323 src/stored/btape.c:1336 src/stored/btape.c:1353
+#: src/stored/btape.c:1096 src/stored/btape.c:1114 src/stored/btape.c:1313
+#: src/stored/btape.c:1325 src/stored/btape.c:1338 src/stored/btape.c:1355
 msgid "This is NOT correct!!!!"
 msgstr ""
 
-#: src/stored/btape.c:1100
+#: src/stored/btape.c:1102
 msgid ""
 "\n"
 "Now the important part, I am going to attempt to append to the tape.\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1107
+#: src/stored/btape.c:1109
 msgid ""
 "Done appending, there should be no I/O errors\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1108
+#: src/stored/btape.c:1110
 msgid "Doing Bacula scan of blocks:\n"
 msgstr ""
 
-#: src/stored/btape.c:1110
+#: src/stored/btape.c:1112
 msgid "End scanning the tape.\n"
 msgstr ""
 
-#: src/stored/btape.c:1111 src/stored/btape.c:1335
+#: src/stored/btape.c:1113 src/stored/btape.c:1337
 #, c-format
 msgid "We should be in file 4. I am at file %d. %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1136
+#: src/stored/btape.c:1138
 msgid ""
 "\n"
 "Autochanger enabled, but no name or no command device specified.\n"
 msgstr ""
 
-#: src/stored/btape.c:1140
+#: src/stored/btape.c:1142
 msgid ""
 "\n"
 "Ah, I see you have an autochanger configured.\n"
@@ -10820,13 +11202,13 @@ msgid ""
 " that I can write on in Slot 1.\n"
 msgstr ""
 
-#: src/stored/btape.c:1143
+#: src/stored/btape.c:1145
 msgid ""
 "\n"
 "Do you wish to continue with the Autochanger test? (y/n): "
 msgstr ""
 
-#: src/stored/btape.c:1150
+#: src/stored/btape.c:1152
 msgid ""
 "\n"
 "\n"
@@ -10834,74 +11216,74 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1159
+#: src/stored/btape.c:1161
 msgid "3301 Issuing autochanger \"loaded\" command.\n"
 msgstr ""
 
-#: src/stored/btape.c:1168
+#: src/stored/btape.c:1170
 #, c-format
 msgid "3991 Bad autochanger command: %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1169
+#: src/stored/btape.c:1171
 #, c-format
 msgid "3991 result=\"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1173
+#: src/stored/btape.c:1175
 #, c-format
 msgid "Slot %d loaded. I am going to unload it.\n"
 msgstr ""
 
-#: src/stored/btape.c:1175
+#: src/stored/btape.c:1177
 msgid "Nothing loaded in the drive. OK.\n"
 msgstr ""
 
-#: src/stored/btape.c:1182
+#: src/stored/btape.c:1184
 #, c-format
 msgid "3302 Issuing autochanger \"unload %d %d\" command.\n"
 msgstr ""
 
-#: src/stored/btape.c:1187
+#: src/stored/btape.c:1189
 #, c-format
 msgid "unload status=%s %d\n"
 msgstr ""
 
-#: src/stored/btape.c:1187
+#: src/stored/btape.c:1189
 msgid "Bad"
 msgstr ""
 
-#: src/stored/btape.c:1190
+#: src/stored/btape.c:1192
 #, c-format
 msgid "3992 Bad autochanger command: %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1191
+#: src/stored/btape.c:1193
 #, c-format
 msgid "3992 result=\"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1201
+#: src/stored/btape.c:1203
 #, c-format
 msgid "3303 Issuing autochanger \"load %d %d\" command.\n"
 msgstr ""
 
-#: src/stored/btape.c:1209
+#: src/stored/btape.c:1211
 #, c-format
 msgid "3303 Autochanger \"load %d %d\" status is OK.\n"
 msgstr ""
 
-#: src/stored/btape.c:1213
+#: src/stored/btape.c:1215
 #, c-format
 msgid "3993 Bad autochanger command: %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1214
+#: src/stored/btape.c:1216
 #, c-format
 msgid "3993 result=\"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1229
+#: src/stored/btape.c:1231
 msgid ""
 "\n"
 "The test failed, probably because you need to put\n"
@@ -10909,12 +11291,12 @@ msgid ""
 "Adding a 30 second sleep and trying again ...\n"
 msgstr ""
 
-#: src/stored/btape.c:1242
+#: src/stored/btape.c:1244
 #, c-format
 msgid "Wrote EOF to %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1246
+#: src/stored/btape.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -10926,18 +11308,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1251
+#: src/stored/btape.c:1253
 msgid ""
 "\n"
 "The test autochanger worked!!\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1262
+#: src/stored/btape.c:1264
 msgid "You must correct this error or the Autochanger will not work.\n"
 msgstr ""
 
-#: src/stored/btape.c:1280
+#: src/stored/btape.c:1282
 msgid ""
 "\n"
 "\n"
@@ -10949,30 +11331,30 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1305
+#: src/stored/btape.c:1307
 msgid "Now forward spacing 1 file.\n"
 msgstr ""
 
-#: src/stored/btape.c:1307 src/stored/btape.c:1319 src/stored/btape.c:1332
-#: src/stored/btape.c:1350 src/stored/btape.c:1519
+#: src/stored/btape.c:1309 src/stored/btape.c:1321 src/stored/btape.c:1334
+#: src/stored/btape.c:1352 src/stored/btape.c:1521
 #, c-format
 msgid "Bad status from fsr. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1310
+#: src/stored/btape.c:1312
 #, c-format
 msgid "We should be in file 1. I am at file %d. %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1317
+#: src/stored/btape.c:1319
 msgid "Now forward spacing 2 files.\n"
 msgstr ""
 
-#: src/stored/btape.c:1330
+#: src/stored/btape.c:1332
 msgid "Now forward spacing 4 files.\n"
 msgstr ""
 
-#: src/stored/btape.c:1342
+#: src/stored/btape.c:1344
 msgid ""
 "The test worked this time. Please add:\n"
 "\n"
@@ -10981,35 +11363,35 @@ msgid ""
 "to your Device resource for this drive.\n"
 msgstr ""
 
-#: src/stored/btape.c:1348
+#: src/stored/btape.c:1350
 msgid "Now forward spacing 1 more file.\n"
 msgstr ""
 
-#: src/stored/btape.c:1352
+#: src/stored/btape.c:1354
 #, c-format
 msgid "We should be in file 5. I am at file %d. %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1357
+#: src/stored/btape.c:1359
 msgid ""
 "\n"
 "=== End Forward space files test ===\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1361
+#: src/stored/btape.c:1363
 msgid ""
 "\n"
 "The forward space file test failed.\n"
 msgstr ""
 
-#: src/stored/btape.c:1363
+#: src/stored/btape.c:1365
 msgid ""
 "You have Fast Forward Space File enabled.\n"
 "I am turning it off then retrying the test.\n"
 msgstr ""
 
-#: src/stored/btape.c:1369
+#: src/stored/btape.c:1371
 msgid ""
 "You must correct this error or Bacula will not work.\n"
 "Some systems, e.g. OpenBSD, require you to set\n"
@@ -11017,7 +11399,7 @@ msgid ""
 "in your device resource. Use with caution.\n"
 msgstr ""
 
-#: src/stored/btape.c:1401
+#: src/stored/btape.c:1403
 msgid ""
 "\n"
 "Append test failed. Attempting again.\n"
@@ -11027,7 +11409,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1409
+#: src/stored/btape.c:1411
 msgid ""
 "\n"
 "\n"
@@ -11039,14 +11421,14 @@ msgid ""
 "to your Device resource in the Storage conf file.\n"
 msgstr ""
 
-#: src/stored/btape.c:1416
+#: src/stored/btape.c:1418
 msgid ""
 "\n"
 "\n"
 "That appears *NOT* to have corrected the problem.\n"
 msgstr ""
 
-#: src/stored/btape.c:1421
+#: src/stored/btape.c:1423
 msgid ""
 "\n"
 "\n"
@@ -11054,7 +11436,7 @@ msgid ""
 "Setting \"BSF at EOM = yes\" and retrying append test.\n"
 msgstr ""
 
-#: src/stored/btape.c:1426
+#: src/stored/btape.c:1428
 msgid ""
 "\n"
 "\n"
@@ -11067,7 +11449,7 @@ msgid ""
 "to your Device resource in the Storage conf file.\n"
 msgstr ""
 
-#: src/stored/btape.c:1437
+#: src/stored/btape.c:1439
 msgid ""
 "\n"
 "Append test failed.\n"
@@ -11094,7 +11476,7 @@ msgid ""
 "in your device resource. Use with caution.\n"
 msgstr ""
 
-#: src/stored/btape.c:1458
+#: src/stored/btape.c:1460
 msgid ""
 "\n"
 "The above Bacula scan should have output identical to what follows.\n"
@@ -11118,116 +11500,116 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1497
+#: src/stored/btape.c:1499
 #, c-format
 msgid "Bad status from fsf. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1501
+#: src/stored/btape.c:1503
 msgid "Forward spaced 1 file.\n"
 msgstr ""
 
-#: src/stored/btape.c:1504
+#: src/stored/btape.c:1506
 #, c-format
 msgid "Forward spaced %d files.\n"
 msgstr ""
 
-#: src/stored/btape.c:1523
+#: src/stored/btape.c:1525
 msgid "Forward spaced 1 record.\n"
 msgstr ""
 
-#: src/stored/btape.c:1526
+#: src/stored/btape.c:1528
 #, c-format
 msgid "Forward spaced %d records.\n"
 msgstr ""
 
-#: src/stored/btape.c:1571
+#: src/stored/btape.c:1573
 #, c-format
 msgid "Wrote one record of %d bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:1573
+#: src/stored/btape.c:1575
 msgid "Wrote block to device.\n"
 msgstr ""
 
-#: src/stored/btape.c:1588
+#: src/stored/btape.c:1590
 msgid "Enter length to read: "
 msgstr ""
 
-#: src/stored/btape.c:1593
+#: src/stored/btape.c:1595
 msgid "Bad length entered, using default of 1024 bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:1602
+#: src/stored/btape.c:1604
 #, c-format
 msgid "Read of %d bytes gives stat=%d. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1625 src/stored/btape.c:1674
+#: src/stored/btape.c:1627 src/stored/btape.c:1676
 #, c-format
 msgid "End of tape\n"
 msgstr ""
 
-#: src/stored/btape.c:1630
+#: src/stored/btape.c:1632
 #, c-format
 msgid "Starting scan at file %u\n"
 msgstr ""
 
-#: src/stored/btape.c:1635 src/stored/dev.c:1344
+#: src/stored/btape.c:1637 src/stored/dev.c:1314
 #, c-format
 msgid "read error on %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/btape.c:1637
+#: src/stored/btape.c:1639
 #, c-format
 msgid "Bad status from read %d. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1640 src/stored/btape.c:1654 src/stored/btape.c:1718
-#: src/stored/btape.c:1730 src/stored/btape.c:1743 src/stored/btape.c:1759
+#: src/stored/btape.c:1642 src/stored/btape.c:1656 src/stored/btape.c:1720
+#: src/stored/btape.c:1732 src/stored/btape.c:1745 src/stored/btape.c:1761
 #, c-format
 msgid "1 block of %d bytes in file %d\n"
 msgstr ""
 
-#: src/stored/btape.c:1643 src/stored/btape.c:1657 src/stored/btape.c:1721
-#: src/stored/btape.c:1733 src/stored/btape.c:1746 src/stored/btape.c:1762
+#: src/stored/btape.c:1645 src/stored/btape.c:1659 src/stored/btape.c:1723
+#: src/stored/btape.c:1735 src/stored/btape.c:1748 src/stored/btape.c:1764
 #, c-format
 msgid "%d blocks of %d bytes in file %d\n"
 msgstr ""
 
-#: src/stored/btape.c:1665 src/stored/btape.c:1737
+#: src/stored/btape.c:1667 src/stored/btape.c:1739
 #, c-format
 msgid "End of File mark.\n"
 msgstr ""
 
-#: src/stored/btape.c:1686 src/stored/btape.c:1790
+#: src/stored/btape.c:1688 src/stored/btape.c:1792
 #, c-format
 msgid "Total files=%d, blocks=%d, bytes = %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1750
+#: src/stored/btape.c:1752
 #, c-format
 msgid "Short block read.\n"
 msgstr ""
 
-#: src/stored/btape.c:1753
+#: src/stored/btape.c:1755
 #, c-format
 msgid "Error reading block. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1777
+#: src/stored/btape.c:1779
 #, c-format
 msgid ""
 "Blk_block: %u dev_blk=%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%"
 "s rlen=%d\n"
 msgstr ""
 
-#: src/stored/btape.c:1799
+#: src/stored/btape.c:1801
 #, c-format
 msgid "Device status: %u. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1829
+#: src/stored/btape.c:1831
 msgid ""
 "\n"
 "This command simulates Bacula writing to a tape.\n"
@@ -11252,67 +11634,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1846
+#: src/stored/btape.c:1848
 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:1849
+#: src/stored/btape.c:1851
 msgid "Simple test (single tape) selected.\n"
 msgstr ""
 
-#: src/stored/btape.c:1852
+#: src/stored/btape.c:1854
 msgid "Multiple tape test selected.\n"
 msgstr ""
 
-#: src/stored/btape.c:1891
+#: src/stored/btape.c:1893
 msgid "Wrote Start of Session label.\n"
 msgstr ""
 
-#: src/stored/btape.c:1922
+#: src/stored/btape.c:1924
 #, c-format
 msgid "%s Begin writing Bacula records to tape ...\n"
 msgstr ""
 
-#: src/stored/btape.c:1924
+#: src/stored/btape.c:1926
 #, c-format
 msgid "%s Begin writing Bacula records to first tape ...\n"
 msgstr ""
 
-#: src/stored/btape.c:1965
+#: src/stored/btape.c:1967
 #, c-format
 msgid "Wrote blk_block=%u, dev_blk_num=%u VolBytes=%s rate=%.1f KB/s\n"
 msgstr ""
 
-#: src/stored/btape.c:1975
+#: src/stored/btape.c:1977
 #, c-format
 msgid "%s Flush block, write EOF\n"
 msgstr ""
 
-#: src/stored/btape.c:1986
+#: src/stored/btape.c:1988
 msgid "Not OK\n"
 msgstr ""
 
-#: src/stored/btape.c:2016
+#: src/stored/btape.c:2018
 msgid "Set ok=false after write_block_to_device.\n"
 msgstr ""
 
-#: src/stored/btape.c:2019
+#: src/stored/btape.c:2021
 msgid "Wrote End of Session label.\n"
 msgstr ""
 
-#: src/stored/btape.c:2043
+#: src/stored/btape.c:2045
 #, c-format
 msgid "Wrote state file last_block_num1=%d last_block_num2=%d\n"
 msgstr ""
 
-#: src/stored/btape.c:2047
+#: src/stored/btape.c:2049
 #, c-format
 msgid "Could not create state file: %s ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:2055
+#: src/stored/btape.c:2057
 #, c-format
 msgid ""
 "\n"
@@ -11320,7 +11702,7 @@ msgid ""
 "%s Done filling tape at %d:%d. Now beginning re-read of tape ...\n"
 msgstr ""
 
-#: src/stored/btape.c:2059
+#: src/stored/btape.c:2061
 #, c-format
 msgid ""
 "\n"
@@ -11328,14 +11710,14 @@ msgid ""
 "%s Done filling tapes at %d:%d. Now beginning re-read of first tape ...\n"
 msgstr ""
 
-#: src/stored/btape.c:2098
+#: src/stored/btape.c:2100
 msgid ""
 "\n"
 "The state file level has changed. You must redo\n"
 "the fill command.\n"
 msgstr ""
 
-#: src/stored/btape.c:2104
+#: src/stored/btape.c:2106
 #, c-format
 msgid ""
 "\n"
@@ -11343,95 +11725,95 @@ msgid ""
 "You must redo the fill command.\n"
 msgstr ""
 
-#: src/stored/btape.c:2160
+#: src/stored/btape.c:2162
 msgid "Mount first tape. Press enter when ready: "
 msgstr ""
 
-#: src/stored/btape.c:2175
+#: src/stored/btape.c:2177
 msgid "Rewinding.\n"
 msgstr ""
 
-#: src/stored/btape.c:2180
+#: src/stored/btape.c:2182
 #, c-format
 msgid "Reading the first 10000 records from %u:%u.\n"
 msgstr ""
 
-#: src/stored/btape.c:2184 src/stored/btape.c:2249
+#: src/stored/btape.c:2186 src/stored/btape.c:2251
 #, c-format
 msgid "Reposition from %u:%u to %u:%u\n"
 msgstr ""
 
-#: src/stored/btape.c:2187 src/stored/btape.c:2236 src/stored/btape.c:2252
+#: src/stored/btape.c:2189 src/stored/btape.c:2238 src/stored/btape.c:2254
 #, c-format
 msgid "Reposition error. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:2190
+#: src/stored/btape.c:2192
 #, c-format
 msgid "Reading block %u.\n"
 msgstr ""
 
-#: src/stored/btape.c:2192 src/stored/btape.c:2241 src/stored/btape.c:2257
+#: src/stored/btape.c:2194 src/stored/btape.c:2243 src/stored/btape.c:2259
 #, c-format
 msgid "Error reading block: ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:2197
+#: src/stored/btape.c:2199
 msgid ""
 "\n"
 "The last block on the tape matches. Test succeeded.\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:2199
+#: src/stored/btape.c:2201
 msgid ""
 "\n"
 "The last block of the first tape matches.\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:2222
+#: src/stored/btape.c:2224
 msgid "Mount second tape. Press enter when ready: "
 msgstr ""
 
-#: src/stored/btape.c:2234
+#: src/stored/btape.c:2236
 #, c-format
 msgid "Reposition from %u:%u to 0:1\n"
 msgstr ""
 
-#: src/stored/btape.c:2239 src/stored/btape.c:2255
+#: src/stored/btape.c:2241 src/stored/btape.c:2257
 #, c-format
 msgid "Reading block %d.\n"
 msgstr ""
 
-#: src/stored/btape.c:2245
+#: src/stored/btape.c:2247
 msgid ""
 "\n"
 "The first block on the second tape matches.\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:2261
+#: src/stored/btape.c:2263
 msgid ""
 "\n"
 "The last block on the second tape matches. Test succeeded.\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:2276
+#: src/stored/btape.c:2278
 #, c-format
 msgid "10000 records read now at %d:%d\n"
 msgstr ""
 
-#: src/stored/btape.c:2299 src/stored/btape.c:2310 src/stored/btape.c:2358
+#: src/stored/btape.c:2301 src/stored/btape.c:2312 src/stored/btape.c:2360
 msgid "Last block written"
 msgstr ""
 
-#: src/stored/btape.c:2301 src/stored/btape.c:2311
+#: src/stored/btape.c:2303 src/stored/btape.c:2313
 msgid "Block read back"
 msgstr ""
 
-#: src/stored/btape.c:2302
+#: src/stored/btape.c:2304
 #, c-format
 msgid ""
 "\n"
@@ -11439,7 +11821,7 @@ msgid ""
 "The blocks differ at byte %u\n"
 msgstr ""
 
-#: src/stored/btape.c:2303
+#: src/stored/btape.c:2305
 msgid ""
 "\n"
 "\n"
@@ -11449,167 +11831,167 @@ msgid ""
 "to write multi-tape Volumes.!!!!\n"
 msgstr ""
 
-#: src/stored/btape.c:2342
+#: src/stored/btape.c:2344
 #, c-format
 msgid "Last block at: %u:%u this_dev_block_num=%d\n"
 msgstr ""
 
-#: src/stored/btape.c:2356
+#: src/stored/btape.c:2358
 #, c-format
 msgid "Block not written: FileIndex=%u blk_block=%u Size=%u\n"
 msgstr ""
 
-#: src/stored/btape.c:2360
+#: src/stored/btape.c:2362
 msgid "Block not written"
 msgstr ""
 
-#: src/stored/btape.c:2375
+#: src/stored/btape.c:2377
 #, c-format
 msgid "End of tape %d:%d. VolumeCapacity=%s. Write rate = %.1f KB/s\n"
 msgstr ""
 
-#: src/stored/btape.c:2425
+#: src/stored/btape.c:2427
 msgid "Test writing blocks of 64512 bytes to tape.\n"
 msgstr ""
 
-#: src/stored/btape.c:2427
+#: src/stored/btape.c:2429
 msgid "How many blocks do you want to write? (1000): "
 msgstr ""
 
-#: src/stored/btape.c:2442
+#: src/stored/btape.c:2444
 #, c-format
 msgid "Begin writing %d Bacula blocks to tape ...\n"
 msgstr ""
 
-#: src/stored/btape.c:2494
+#: src/stored/btape.c:2496
 #, c-format
 msgid "Begin writing raw blocks of %u bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:2518
+#: src/stored/btape.c:2520
 #, c-format
 msgid "Write failed at block %u. stat=%d ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:2527
+#: src/stored/btape.c:2529
 msgid "test autochanger"
 msgstr ""
 
-#: src/stored/btape.c:2528
+#: src/stored/btape.c:2530
 msgid "backspace file"
 msgstr ""
 
-#: src/stored/btape.c:2529
+#: src/stored/btape.c:2531
 msgid "backspace record"
 msgstr ""
 
-#: src/stored/btape.c:2530
+#: src/stored/btape.c:2532
 msgid "list device capabilities"
 msgstr ""
 
-#: src/stored/btape.c:2531
+#: src/stored/btape.c:2533
 msgid "clear tape errors"
 msgstr ""
 
-#: src/stored/btape.c:2532
+#: src/stored/btape.c:2534
 msgid "go to end of Bacula data for append"
 msgstr ""
 
-#: src/stored/btape.c:2533
+#: src/stored/btape.c:2535
 msgid "go to the physical end of medium"
 msgstr ""
 
-#: src/stored/btape.c:2534
+#: src/stored/btape.c:2536
 msgid "fill tape, write onto second volume"
 msgstr ""
 
-#: src/stored/btape.c:2535
+#: src/stored/btape.c:2537
 msgid "read filled tape"
 msgstr ""
 
-#: src/stored/btape.c:2536
+#: src/stored/btape.c:2538
 msgid "forward space a file"
 msgstr ""
 
-#: src/stored/btape.c:2537
+#: src/stored/btape.c:2539
 msgid "forward space a record"
 msgstr ""
 
-#: src/stored/btape.c:2539
+#: src/stored/btape.c:2541
 msgid "write a Bacula label to the tape"
 msgstr ""
 
-#: src/stored/btape.c:2540
+#: src/stored/btape.c:2542
 msgid "load a tape"
 msgstr ""
 
-#: src/stored/btape.c:2541
+#: src/stored/btape.c:2543
 msgid "quit btape"
 msgstr ""
 
-#: src/stored/btape.c:2542
+#: src/stored/btape.c:2544
 msgid "use write() to fill tape"
 msgstr ""
 
-#: src/stored/btape.c:2543
+#: src/stored/btape.c:2545
 msgid "read and print the Bacula tape label"
 msgstr ""
 
-#: src/stored/btape.c:2544
+#: src/stored/btape.c:2546
 msgid "test record handling functions"
 msgstr ""
 
-#: src/stored/btape.c:2545
+#: src/stored/btape.c:2547
 msgid "rewind the tape"
 msgstr ""
 
-#: src/stored/btape.c:2546
+#: src/stored/btape.c:2548
 msgid "read() tape block by block to EOT and report"
 msgstr ""
 
-#: src/stored/btape.c:2547
+#: src/stored/btape.c:2549
 msgid "Bacula read block by block to EOT and report"
 msgstr ""
 
-#: src/stored/btape.c:2548
+#: src/stored/btape.c:2550
 msgid "print tape status"
 msgstr ""
 
-#: src/stored/btape.c:2549
+#: src/stored/btape.c:2551
 msgid "General test Bacula tape functions"
 msgstr ""
 
-#: src/stored/btape.c:2550
+#: src/stored/btape.c:2552
 msgid "write an EOF on the tape"
 msgstr ""
 
-#: src/stored/btape.c:2551
+#: src/stored/btape.c:2553
 msgid "write a single Bacula block"
 msgstr ""
 
-#: src/stored/btape.c:2552
+#: src/stored/btape.c:2554
 msgid "read a single record"
 msgstr ""
 
-#: src/stored/btape.c:2553
+#: src/stored/btape.c:2555
 msgid "read a single Bacula block"
 msgstr ""
 
-#: src/stored/btape.c:2554
+#: src/stored/btape.c:2556
 msgid "quick fill command"
 msgstr ""
 
-#: src/stored/btape.c:2575
+#: src/stored/btape.c:2577
 #, c-format
 msgid "\"%s\" is an invalid command\n"
 msgstr ""
 
-#: src/stored/btape.c:2584
+#: src/stored/btape.c:2586
 #, c-format
 msgid "Interactive commands:\n"
 msgstr ""
 
-#: src/stored/btape.c:2595
+#: src/stored/btape.c:2597
 #, c-format
 msgid ""
 "\n"
@@ -11626,27 +12008,27 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:2680
+#: src/stored/btape.c:2682
 #, c-format
 msgid "Mount second Volume on device %s and press return when ready: "
 msgstr ""
 
-#: src/stored/btape.c:2707
+#: src/stored/btape.c:2709
 #, c-format
 msgid "Mount blank Volume on device %s and press return when ready: "
 msgstr ""
 
-#: src/stored/btape.c:2725
+#: src/stored/btape.c:2727
 #, c-format
 msgid "End of Volume \"%s\" %d records.\n"
 msgstr ""
 
-#: src/stored/btape.c:2738
+#: src/stored/btape.c:2740
 #, c-format
 msgid "Read block=%u, VolBytes=%s rate=%.1f KB/s\n"
 msgstr ""
 
-#: src/stored/btape.c:2750 src/stored/mount.c:606
+#: src/stored/btape.c:2752 src/stored/mount.c:627
 #, c-format
 msgid "Cannot open Dev=%s, Vol=%s\n"
 msgstr ""
@@ -11685,441 +12067,433 @@ msgstr ""
 msgid "Cannot init device %s\n"
 msgstr ""
 
-#: src/stored/butil.c:195
+#: src/stored/butil.c:194
 #, c-format
 msgid "Cannot open %s\n"
 msgstr ""
 
-#: src/stored/butil.c:278
+#: src/stored/butil.c:277
 #, c-format
 msgid "Could not find device \"%s\" in config file %s.\n"
 msgstr ""
 
-#: src/stored/butil.c:283
+#: src/stored/butil.c:282
 #, c-format
 msgid "Using device: \"%s\" for reading.\n"
 msgstr ""
 
-#: src/stored/butil.c:286
+#: src/stored/butil.c:285
 #, c-format
 msgid "Using device: \"%s\" for writing.\n"
 msgstr ""
 
-#: src/stored/butil.c:302
+#: src/stored/butil.c:301
 msgid "Unexpected End of Data\n"
 msgstr ""
 
-#: src/stored/butil.c:304
+#: src/stored/butil.c:303
 msgid "Unexpected End of Tape\n"
 msgstr ""
 
-#: src/stored/butil.c:306
+#: src/stored/butil.c:305
 msgid "Unexpected End of File\n"
 msgstr ""
 
-#: src/stored/butil.c:308
+#: src/stored/butil.c:307
 msgid "Tape Door is Open\n"
 msgstr ""
 
-#: src/stored/butil.c:310
+#: src/stored/butil.c:309
 msgid "Unexpected Tape is Off-line\n"
 msgstr ""
 
-#: src/stored/dev.c:125
+#: src/stored/dev.c:119
 #, c-format
 msgid "Unable to stat device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/dev.c:136
+#: src/stored/dev.c:130
 #, c-format
 msgid ""
 "%s is an unknown device type. Must be tape or directory\n"
 " or have RequiresMount=yes for DVD. st_mode=%x\n"
 msgstr ""
 
-#: src/stored/dev.c:195
+#: src/stored/dev.c:189
 #, c-format
 msgid "Unable to stat mount point %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/dev.c:202
+#: src/stored/dev.c:195
 msgid ""
 "Mount and unmount commands must defined for a device which requires mount.\n"
 msgstr ""
 
-#: src/stored/dev.c:205
+#: src/stored/dev.c:198
 msgid "Write part command must be defined for a device which requires mount.\n"
 msgstr ""
 
-#: src/stored/dev.c:210
+#: src/stored/dev.c:203
 #, c-format
 msgid "Block size %u on device %s is too large, using default %u\n"
 msgstr ""
 
-#: src/stored/dev.c:215
+#: src/stored/dev.c:208
 #, c-format
 msgid "Max block size %u not multiple of device %s block size.\n"
 msgstr ""
 
-#: src/stored/dev.c:231 src/stored/dev.c:237
+#: src/stored/dev.c:224 src/stored/dev.c:230
 #, c-format
 msgid "Unable to init cond variable: ERR=%s\n"
 msgstr ""
 
-#: src/stored/dev.c:330
+#: src/stored/dev.c:326
 msgid "Illegal mode given to open dev.\n"
 msgstr ""
 
-#: src/stored/dev.c:424 src/stored/device.c:306
+#: src/stored/dev.c:421 src/stored/device.c:325
 #, c-format
 msgid "Unable to open device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/dev.c:459 src/stored/dev.c:526
+#: src/stored/dev.c:456
 #, c-format
 msgid "Could not open file device %s. No Volume name given.\n"
 msgstr ""
 
-#: src/stored/dev.c:482 src/stored/dev.c:650
+#: src/stored/dev.c:479 src/stored/dev.c:647
 #, c-format
 msgid "Could not open: %s, ERR=%s\n"
 msgstr ""
 
-#: src/stored/dev.c:575
+#: src/stored/dev.c:523
+#, c-format
+msgid "Could not open DVD device %s. No Volume name given.\n"
+msgstr ""
+
+#: src/stored/dev.c:572
 #, c-format
 msgid "The DVD in device %s contains data, please blank it before writing.\n"
 msgstr ""
 
-#: src/stored/dev.c:596
+#: src/stored/dev.c:593
 #, c-format
 msgid "Unable to stat DVD part 1 file %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/dev.c:604
+#: src/stored/dev.c:601
 #, c-format
 msgid "DVD part 1 is not a regular file %s.\n"
 msgstr ""
 
-#: src/stored/dev.c:624
+#: src/stored/dev.c:621
 #, c-format
 msgid "There is no valid DVD in device %s.\n"
 msgstr ""
 
-#: src/stored/dev.c:630
+#: src/stored/dev.c:627
 #, c-format
 msgid "Could not mount DVD device %s.\n"
 msgstr ""
 
-#: src/stored/dev.c:680
+#: src/stored/dev.c:677
 #, c-format
 msgid "Could not fstat: %s, ERR=%s\n"
 msgstr ""
 
-#: src/stored/dev.c:714
+#: src/stored/dev.c:711
 #, c-format
 msgid "Bad call to rewind. Device %s not open\n"
 msgstr ""
 
-#: src/stored/dev.c:753
+#: src/stored/dev.c:750
 #, c-format
 msgid "No tape loaded or drive offline on %s.\n"
 msgstr ""
 
-#: src/stored/dev.c:763
+#: src/stored/dev.c:760
 #, c-format
 msgid "Rewind error on %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/dev.c:773 src/stored/dev.c:886 src/stored/dev.c:1022
-#: src/stored/dev.c:1591
+#: src/stored/dev.c:770 src/stored/dev.c:848 src/stored/dev.c:985
+#: src/stored/dev.c:1561
 #, c-format
 msgid "lseek error on %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/dev.c:813
-msgid "unknown blocked code"
-msgstr ""
-
-#: src/stored/dev.c:857
+#: src/stored/dev.c:819
 #, c-format
 msgid "Bad call to eod. Device %s not open\n"
 msgstr ""
 
-#: src/stored/dev.c:922
+#: src/stored/dev.c:884
 #, c-format
 msgid "ioctl MTEOM error on %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/dev.c:930 src/stored/dev.c:1063
+#: src/stored/dev.c:893 src/stored/dev.c:1026
 #, c-format
 msgid "ioctl MTIOCGET error on %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/dev.c:1008
+#: src/stored/dev.c:971
 msgid "Bad device call. Device not open\n"
 msgstr ""
 
-#: src/stored/dev.c:1021
+#: src/stored/dev.c:984
 #, c-format
 msgid "Seek error: ERR=%s\n"
 msgstr ""
 
-#: src/stored/dev.c:1058
+#: src/stored/dev.c:1021
 msgid " Bacula status:"
 msgstr ""
 
-#: src/stored/dev.c:1059 src/stored/dev.c:1142 src/stored/dev.c:1144
+#: src/stored/dev.c:1022 src/stored/dev.c:1105 src/stored/dev.c:1107
 #, c-format
 msgid " file=%d block=%d\n"
 msgstr ""
 
-#: src/stored/dev.c:1067
+#: src/stored/dev.c:1030
 msgid " Device status:"
 msgstr ""
 
-#: src/stored/dev.c:1166
+#: src/stored/dev.c:1129
 msgid "Bad call to load_dev. Device not open\n"
 msgstr ""
 
-#: src/stored/dev.c:1177 src/stored/dev.c:1190
+#: src/stored/dev.c:1140 src/stored/dev.c:1153
 #, c-format
 msgid "ioctl MTLOAD error on %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/dev.c:1221
+#: src/stored/dev.c:1184
 #, c-format
 msgid "ioctl MTOFFL error on %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/dev.c:1262
+#: src/stored/dev.c:1225
 msgid "Bad call to fsf. Device not open\n"
 msgstr ""
 
-#: src/stored/dev.c:1273 src/stored/dev.c:1393
+#: src/stored/dev.c:1236 src/stored/dev.c:1363
 #, c-format
 msgid "Device %s at End of Tape.\n"
 msgstr ""
 
-#: src/stored/dev.c:1298 src/stored/dev.c:1373
+#: src/stored/dev.c:1267 src/stored/dev.c:1343
 #, c-format
 msgid "ioctl MTFSF error on %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/dev.c:1422
+#: src/stored/dev.c:1392
 msgid "Bad call to bsf. Device not open\n"
 msgstr ""
 
-#: src/stored/dev.c:1428
+#: src/stored/dev.c:1398
 #, c-format
 msgid "Device %s cannot BSF because it is not a tape.\n"
 msgstr ""
 
-#: src/stored/dev.c:1445
+#: src/stored/dev.c:1415
 #, c-format
 msgid "ioctl MTBSF error on %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/dev.c:1464
+#: src/stored/dev.c:1434
 msgid "Bad call to fsr. Device not open\n"
 msgstr ""
 
-#: src/stored/dev.c:1474
+#: src/stored/dev.c:1444
 #, c-format
 msgid "ioctl MTFSR not permitted on %s.\n"
 msgstr ""
 
-#: src/stored/dev.c:1502
+#: src/stored/dev.c:1472
 #, c-format
 msgid "ioctl MTFSR %d error on %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/dev.c:1520
+#: src/stored/dev.c:1490
 msgid "Bad call to bsr_dev. Device not open\n"
 msgstr ""
 
-#: src/stored/dev.c:1530
+#: src/stored/dev.c:1500
 #, c-format
 msgid "ioctl MTBSR not permitted on %s.\n"
 msgstr ""
 
-#: src/stored/dev.c:1544
+#: src/stored/dev.c:1514
 #, c-format
 msgid "ioctl MTBSR error on %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/dev.c:1580
+#: src/stored/dev.c:1550
 msgid "Bad call to reposition. Device not open\n"
 msgstr ""
 
-#: src/stored/dev.c:1659
+#: src/stored/dev.c:1629
 msgid "Bad call to weof_dev. Device not open\n"
 msgstr ""
 
-#: src/stored/dev.c:1669
+#: src/stored/dev.c:1639
 msgid "Attempt to WEOF on non-appendable Volume\n"
 msgstr ""
 
-#: src/stored/dev.c:1687
+#: src/stored/dev.c:1657
 #, c-format
 msgid "ioctl MTWEOF error on %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/dev.c:1787
+#: src/stored/dev.c:1756
 #, c-format
 msgid "unknown func code %d"
 msgstr ""
 
-#: src/stored/dev.c:1793
+#: src/stored/dev.c:1762
 #, c-format
 msgid "I/O function \"%s\" not supported on this device.\n"
 msgstr ""
 
-#: src/stored/dev.c:1942
+#: src/stored/dev.c:1917
 #, c-format
 msgid "Unable to truncate device %s. ERR=%s\n"
 msgstr ""
 
-#: src/stored/dev.c:2041 src/stored/dev.c:2046
+#: src/stored/dev.c:2016 src/stored/dev.c:2021
 #, c-format
 msgid "Device %s cannot be %smounted. ERR=%s\n"
 msgstr ""
 
-#: src/stored/dev.c:2382
+#: src/stored/dev.c:2429
 #, c-format
 msgid "Unable to set eotmodel on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/device.c:111
+#: src/stored/device.c:120
 #, c-format
 msgid "End of medium on Volume \"%s\" Bytes=%s Blocks=%s at %s.\n"
 msgstr ""
 
-#: src/stored/device.c:125
+#: src/stored/device.c:136
 #, c-format
 msgid "New volume \"%s\" mounted on device %s at %s.\n"
 msgstr ""
 
-#: src/stored/device.c:137
+#: src/stored/device.c:148
 #, c-format
 msgid "write_block_to_device Volume label failed. ERR=%s"
 msgstr ""
 
-#: src/stored/device.c:173
+#: src/stored/device.c:183
 #, c-format
 msgid "write_block_to_device overflow block failed. ERR=%s"
 msgstr ""
 
-#: src/stored/device.c:308
+#: src/stored/device.c:327
 #, c-format
 msgid "Unable to open archive %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/device.c:322
-#, c-format
-msgid "Device write lock failure. ERR=%s\n"
-msgstr ""
-
-#: src/stored/device.c:330
-#, c-format
-msgid "Device write unlock failure. ERR=%s\n"
-msgstr ""
-
-#: src/stored/device.c:349
-#, c-format
-msgid "pthread_cond_wait failure. ERR=%s\n"
-msgstr ""
-
-#: src/stored/dircmd.c:152
+#: src/stored/dircmd.c:154
 msgid "Connection request failed.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:161
+#: src/stored/dircmd.c:163
 #, c-format
 msgid "Invalid connection. Len=%d\n"
 msgstr ""
 
-#: src/stored/dircmd.c:253
+#: src/stored/dircmd.c:274
 #, c-format
 msgid "3991 Bad setdebug command: %s\n"
 msgstr ""
 
-#: src/stored/dircmd.c:274
+#: src/stored/dircmd.c:295
 #, c-format
 msgid "3904 Job %s not found.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:295
-msgid "Job marked to be canceled.\n"
+#: src/stored/dircmd.c:321
+#, c-format
+msgid "Job %s marked to be canceled.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:296
+#: src/stored/dircmd.c:322
 #, c-format
 msgid "3000 Job %s marked to be canceled.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:300
+#: src/stored/dircmd.c:326
 msgid "3903 Error scanning cancel command.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:377 src/stored/dircmd.c:733 src/stored/dircmd.c:824
-#: src/stored/dircmd.c:897 src/stored/dircmd.c:961 src/stored/dircmd.c:1005
+#: src/stored/dircmd.c:402 src/stored/dircmd.c:758 src/stored/dircmd.c:848
+#: src/stored/dircmd.c:920 src/stored/dircmd.c:983 src/stored/dircmd.c:1026
 #, c-format
 msgid "3999 Device \"%s\" not found or could not be opened.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:382
+#: src/stored/dircmd.c:407
 #, c-format
 msgid "3903 Error scanning label command: %s\n"
 msgstr ""
 
-#: src/stored/dircmd.c:432
+#: src/stored/dircmd.c:457
 #, c-format
 msgid "3910 Unable to open device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/dircmd.c:449
+#: src/stored/dircmd.c:474
 #, c-format
 msgid "3920 Cannot label Volume because it is already labeled: \"%s\"\n"
 msgstr ""
 
-#: src/stored/dircmd.c:456
+#: src/stored/dircmd.c:481
 msgid "3921 Wrong volume mounted.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:460
+#: src/stored/dircmd.c:485
 msgid "3922 Cannot relabel an ANSI/IBM labeled Volume.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:468 src/stored/dircmd.c:478
+#: src/stored/dircmd.c:493
 #, c-format
 msgid "3912 Failed to label Volume: ERR=%s\n"
 msgstr ""
 
-#: src/stored/dircmd.c:481
+#: src/stored/dircmd.c:503
+#, c-format
+msgid "3914 Failed to label Volume (no media): ERR=%s\n"
+msgstr ""
+
+#: src/stored/dircmd.c:506
 #, c-format
 msgid "3913 Cannot label Volume. Unknown status %d from read_volume_label()\n"
 msgstr ""
 
-#: src/stored/dircmd.c:514
+#: src/stored/dircmd.c:539
 #, c-format
 msgid "3001 Mounted Volume: %s\n"
 msgstr ""
 
-#: src/stored/dircmd.c:518 src/stored/dircmd.c:1042
+#: src/stored/dircmd.c:543 src/stored/dircmd.c:1062
 #, c-format
 msgid ""
 "3902 Cannot mount Volume on Storage Device %s because:\n"
 "%s"
 msgstr ""
 
-#: src/stored/dircmd.c:546 src/stored/reserve.c:709
+#: src/stored/dircmd.c:571 src/stored/reserve.c:1073
 #, c-format
 msgid ""
 "\n"
 "     Device \"%s\" requested by DIR could not be opened or does not exist.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:568 src/stored/reserve.c:705
+#: src/stored/dircmd.c:593 src/stored/reserve.c:1069
 #, c-format
 msgid ""
 "\n"
@@ -12127,181 +12501,181 @@ msgid ""
 "does not exist.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:643 src/stored/dircmd.c:699
+#: src/stored/dircmd.c:668 src/stored/dircmd.c:725
 #, c-format
 msgid "3901 open device failed: ERR=%s\n"
 msgstr ""
 
-#: src/stored/dircmd.c:663 src/stored/dircmd.c:690
+#: src/stored/dircmd.c:688 src/stored/dircmd.c:716
 #, c-format
 msgid "3001 Device %s is mounted with Volume \"%s\"\n"
 msgstr ""
 
-#: src/stored/dircmd.c:666 src/stored/dircmd.c:693 src/stored/dircmd.c:708
+#: src/stored/dircmd.c:691 src/stored/dircmd.c:719 src/stored/dircmd.c:734
 #, c-format
 msgid ""
 "3905 Device %s open but no Bacula volume is mounted.\n"
 "If this is not a blank tape, try unmounting and remounting the Volume.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:675
+#: src/stored/dircmd.c:701
 #, c-format
 msgid "3001 Device %s is doing acquire.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:680 src/stored/dircmd.c:795
+#: src/stored/dircmd.c:706 src/stored/dircmd.c:820
 #, c-format
 msgid "3903 Device %s is being labeled.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:705
+#: src/stored/dircmd.c:731
 #, c-format
 msgid "3001 Device %s is already mounted with Volume \"%s\"\n"
 msgstr ""
 
-#: src/stored/dircmd.c:714
+#: src/stored/dircmd.c:740
 #, c-format
 msgid "3002 Device %s is mounted.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:717 src/stored/dircmd.c:768 src/stored/dircmd.c:783
-#: src/stored/dircmd.c:814
+#: src/stored/dircmd.c:743 src/stored/dircmd.c:793 src/stored/dircmd.c:808
+#: src/stored/dircmd.c:839
 #, c-format
 msgid "3907 %s"
 msgstr ""
 
-#: src/stored/dircmd.c:720
+#: src/stored/dircmd.c:746
 #, c-format
 msgid "3906 File device %s is always mounted.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:726
+#: src/stored/dircmd.c:752
 #, c-format
 msgid "3905 Bizarre wait state %d\n"
 msgstr ""
 
-#: src/stored/dircmd.c:737
+#: src/stored/dircmd.c:762
 #, c-format
 msgid "3909 Error scanning mount command: %s\n"
 msgstr ""
 
-#: src/stored/dircmd.c:765 src/stored/dircmd.c:816
+#: src/stored/dircmd.c:790 src/stored/dircmd.c:841
 #, c-format
 msgid "3002 Device %s unmounted.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:772
+#: src/stored/dircmd.c:797
 #, c-format
 msgid "3901 Device %s is already unmounted.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:786
+#: src/stored/dircmd.c:811
 #, c-format
 msgid "3001 Device %s unmounted.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:791
+#: src/stored/dircmd.c:816
 #, c-format
 msgid "3902 Device %s is busy in acquire.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:829
+#: src/stored/dircmd.c:853
 #, c-format
 msgid "3907 Error scanning unmount command: %s\n"
 msgstr ""
 
-#: src/stored/dircmd.c:860
+#: src/stored/dircmd.c:884
 #, c-format
 msgid "3921 Device %s already released.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:867
+#: src/stored/dircmd.c:891
 #, c-format
 msgid "3922 Device %s waiting for sysop.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:873
+#: src/stored/dircmd.c:897
 #, c-format
 msgid "3922 Device %s waiting for mount.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:877
+#: src/stored/dircmd.c:901
 #, c-format
 msgid "3923 Device %s is busy in acquire.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:881
+#: src/stored/dircmd.c:905
 #, c-format
 msgid "3914 Device %s is being labeled.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:890
+#: src/stored/dircmd.c:914
 #, c-format
 msgid "3022 Device %s released.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:902
+#: src/stored/dircmd.c:925
 #, c-format
 msgid "3927 Error scanning release command: %s\n"
 msgstr ""
 
-#: src/stored/dircmd.c:947
+#: src/stored/dircmd.c:970
 #, c-format
 msgid "3995 Device %s is not an autochanger.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:965
+#: src/stored/dircmd.c:987
 #, c-format
 msgid "3908 Error scanning autocharger drives/list/slots command: %s\n"
 msgstr ""
 
-#: src/stored/dircmd.c:1009
+#: src/stored/dircmd.c:1030
 #, c-format
 msgid "3909 Error scanning readlabel command: %s\n"
 msgstr ""
 
-#: src/stored/dircmd.c:1038
+#: src/stored/dircmd.c:1058
 #, c-format
 msgid "3001 Volume=%s Slot=%d\n"
 msgstr ""
 
-#: src/stored/dircmd.c:1071
+#: src/stored/dircmd.c:1090
 #, c-format
 msgid "3931 Device %s is BLOCKED. user unmounted.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:1075
+#: src/stored/dircmd.c:1094
 #, c-format
 msgid ""
 "3932 Device %s is BLOCKED. user unmounted during wait for media/mount.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:1079
+#: src/stored/dircmd.c:1098
 #, c-format
 msgid "3933 Device %s is BLOCKED waiting for media.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:1083
+#: src/stored/dircmd.c:1102
 #, c-format
 msgid "3934 Device %s is being initialized.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:1087
+#: src/stored/dircmd.c:1106
 #, c-format
 msgid "3935 Device %s is blocked labeling a Volume.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:1091
+#: src/stored/dircmd.c:1110
 #, c-format
 msgid "3935 Device %s is blocked for unknown reason.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:1096
+#: src/stored/dircmd.c:1115
 #, c-format
 msgid "3936 Device %s is busy reading.\n"
 msgstr ""
 
-#: src/stored/dircmd.c:1099
+#: src/stored/dircmd.c:1118
 #, c-format
 msgid "3937 Device %s is busy with %d writer(s).\n"
 msgstr ""
@@ -12357,29 +12731,29 @@ msgstr ""
 msgid "Unable to write last on %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:361
+#: src/stored/fd_cmds.c:368
 msgid "Error parsing bootstrap file.\n"
 msgstr ""
 
-#: src/stored/job.c:205
+#: src/stored/job.c:207
 #, c-format
 msgid "Job name not found: %s\n"
 msgstr ""
 
-#: src/stored/job.c:216
+#: src/stored/job.c:218
 #, c-format
 msgid "Hey!!!! JobId %u Job %s already authenticated.\n"
 msgstr ""
 
-#: src/stored/job.c:227
+#: src/stored/job.c:229
 msgid "Unable to authenticate File daemon\n"
 msgstr ""
 
-#: src/stored/job.c:349
+#: src/stored/job.c:351
 msgid "In free_jcr(), but still attached to device!!!!\n"
 msgstr ""
 
-#: src/stored/label.c:91 src/stored/label.c:132 src/stored/label.c:221
+#: src/stored/label.c:91 src/stored/label.c:132 src/stored/label.c:226
 #, c-format
 msgid "Wrong Volume mounted on device %s: Wanted %s have %s\n"
 msgstr ""
@@ -12424,62 +12798,67 @@ msgstr ""
 msgid "Volume on %s has bad Bacula label type: %x\n"
 msgstr ""
 
-#: src/stored/label.c:285
+#: src/stored/label.c:217 src/stored/label.c:402
+#, c-format
+msgid "Could not reserve volume %s on %s\n"
+msgstr ""
+
+#: src/stored/label.c:290
 #, c-format
 msgid "Cannot write Volume label to block for device %s\n"
 msgstr ""
 
-#: src/stored/label.c:441
+#: src/stored/label.c:449
 #, c-format
 msgid "Rewind error on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:447
+#: src/stored/label.c:455
 #, c-format
 msgid "Truncate error on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:453
+#: src/stored/label.c:461
 #, c-format
 msgid "Failed to re-open DVD after truncate on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:476
+#: src/stored/label.c:484
 #, c-format
 msgid "Unable to write device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:504
+#: src/stored/label.c:512
 #, c-format
 msgid "Recycled volume \"%s\" on device %s, all previous data lost.\n"
 msgstr ""
 
-#: src/stored/label.c:507
+#: src/stored/label.c:515
 #, c-format
 msgid "Wrote label to prelabeled Volume \"%s\" on device %s\n"
 msgstr ""
 
-#: src/stored/label.c:712
+#: src/stored/label.c:719
 #, c-format
 msgid "Bad session label = %d\n"
 msgstr ""
 
-#: src/stored/label.c:730 src/stored/label.c:737
+#: src/stored/label.c:737 src/stored/label.c:744
 #, c-format
 msgid "Error writing Session label to %s: %s\n"
 msgstr ""
 
-#: src/stored/label.c:772
+#: src/stored/label.c:779
 #, c-format
 msgid "Expecting Volume Label, got FI=%s Stream=%s len=%d\n"
 msgstr ""
 
-#: src/stored/label.c:899
+#: src/stored/label.c:906
 #, c-format
 msgid "Unknown %d"
 msgstr ""
 
-#: src/stored/label.c:903
+#: src/stored/label.c:910
 #, c-format
 msgid ""
 "\n"
@@ -12496,17 +12875,17 @@ msgid ""
 "HostName          : %s\n"
 msgstr ""
 
-#: src/stored/label.c:925
+#: src/stored/label.c:932
 #, c-format
 msgid "Date label written: %s\n"
 msgstr ""
 
-#: src/stored/label.c:931
+#: src/stored/label.c:938
 #, c-format
 msgid "Date label written: %04d-%02d-%02d at %02d:%02d\n"
 msgstr ""
 
-#: src/stored/label.c:951
+#: src/stored/label.c:958
 #, c-format
 msgid ""
 "\n"
@@ -12519,7 +12898,7 @@ msgid ""
 "ClientName        : %s\n"
 msgstr ""
 
-#: src/stored/label.c:964
+#: src/stored/label.c:971
 #, c-format
 msgid ""
 "Job (unique name) : %s\n"
@@ -12528,7 +12907,7 @@ msgid ""
 "JobLevel          : %c\n"
 msgstr ""
 
-#: src/stored/label.c:973
+#: src/stored/label.c:980
 #, c-format
 msgid ""
 "JobFiles          : %s\n"
@@ -12541,52 +12920,52 @@ msgid ""
 "JobStatus         : %c\n"
 msgstr ""
 
-#: src/stored/label.c:994
+#: src/stored/label.c:1001
 #, c-format
 msgid "Date written      : %s\n"
 msgstr ""
 
-#: src/stored/label.c:999
+#: src/stored/label.c:1006
 #, c-format
 msgid "Date written      : %04d-%02d-%02d at %02d:%02d\n"
 msgstr ""
 
-#: src/stored/label.c:1018
+#: src/stored/label.c:1025
 msgid "Fresh Volume"
 msgstr ""
 
-#: src/stored/label.c:1021
+#: src/stored/label.c:1028
 msgid "Volume"
 msgstr ""
 
-#: src/stored/label.c:1030 src/stored/read_record.c:401
+#: src/stored/label.c:1037 src/stored/read_record.c:402
 msgid "End of Media"
 msgstr ""
 
-#: src/stored/label.c:1033
+#: src/stored/label.c:1040
 msgid "End of Tape"
 msgstr ""
 
-#: src/stored/label.c:1053 src/stored/label.c:1061 src/stored/label.c:1094
+#: src/stored/label.c:1060 src/stored/label.c:1068 src/stored/label.c:1101
 #, c-format
 msgid "%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d DataLen=%d\n"
 msgstr ""
 
-#: src/stored/label.c:1058
+#: src/stored/label.c:1065
 msgid "End of physical tape.\n"
 msgstr ""
 
-#: src/stored/label.c:1073 src/stored/label.c:1082
+#: src/stored/label.c:1080 src/stored/label.c:1089
 #, c-format
 msgid "%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d\n"
 msgstr ""
 
-#: src/stored/label.c:1075
+#: src/stored/label.c:1082
 #, c-format
 msgid "   Job=%s Date=%s Level=%c Type=%c\n"
 msgstr ""
 
-#: src/stored/label.c:1084
+#: src/stored/label.c:1091
 #, c-format
 msgid "   Date=%s Level=%c Type=%c Files=%s Bytes=%s Errors=%d Status=%c\n"
 msgstr ""
@@ -12600,6 +12979,11 @@ msgstr ""
 msgid "No Volume names found for %s.\n"
 msgstr ""
 
+#: src/stored/mount.c:90
+#, c-format
+msgid "Too many errors trying to mount device %s.\n"
+msgstr ""
+
 #: src/stored/mount.c:96
 #, c-format
 msgid "Job %d canceled.\n"
@@ -12610,7 +12994,7 @@ msgstr ""
 msgid "Could not open device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/mount.c:254 src/stored/mount.c:511
+#: src/stored/mount.c:254 src/stored/mount.c:533
 #, c-format
 msgid "Volume \"%s\" not on device %s.\n"
 msgstr ""
@@ -12641,59 +13025,71 @@ msgstr ""
 #: src/stored/mount.c:390
 #, c-format
 msgid ""
-"I cannot write on Volume \"%s\" because: The sizes do not match! Volume=%s "
-"Catalog=%s\n"
+"Bacula cannot write on DVD Volume \"%s\" because: The sizes do not match! "
+"Volume=%s Catalog=%s\n"
 msgstr ""
 
-#: src/stored/mount.c:406
+#: src/stored/mount.c:404
 #, c-format
 msgid "Ready to append to end of Volume \"%s\" at file=%d.\n"
 msgstr ""
 
-#: src/stored/mount.c:409
+#: src/stored/mount.c:407
 #, c-format
 msgid ""
-"I cannot write on Volume \"%s\" because:\n"
+"Bacula cannot write on tape Volume \"%s\" because:\n"
 "The number of files mismatch! Volume=%u Catalog=%u\n"
 msgstr ""
 
-#: src/stored/mount.c:437
+#: src/stored/mount.c:418
+#, c-format
+msgid "Ready to append to end of Volume \"%s\" size=%s\n"
+msgstr ""
+
+#: src/stored/mount.c:422
+#, c-format
+msgid ""
+"Bacula cannot write on disk Volume \"%s\" because: The sizes do not match! "
+"Volume=%s Catalog=%s\n"
+msgstr ""
+
+#: src/stored/mount.c:452
 #, c-format
 msgid "Ready to append to end of Volume \"%s\" at file address=%u.\n"
 msgstr ""
 
-#: src/stored/mount.c:441
+#: src/stored/mount.c:456
 #, c-format
 msgid ""
-"I cannot write on Volume \"%s\" because:\n"
+"Bacula cannot write on Volume \"%s\" because:\n"
 "The EOD file address is wrong: Volume file address=%u != Catalog Endblock=%u"
 "(+1)\n"
-"You probably removed DVD last part in spool directory.\n"
+"Perhaps You removed the DVD last part in spool directory.\n"
 msgstr ""
 
-#: src/stored/mount.c:501
+#: src/stored/mount.c:523
 #, c-format
 msgid "Labeled new Volume \"%s\" on device %s.\n"
 msgstr ""
 
-#: src/stored/mount.c:506
+#: src/stored/mount.c:528
 #, c-format
-msgid "Warning device %s not configured to autolabel Volumes.\n"
+msgid "Device %s not configured to autolabel Volumes.\n"
 msgstr ""
 
-#: src/stored/mount.c:526
+#: src/stored/mount.c:548
 #, c-format
 msgid "Marking Volume \"%s\" in Error in Catalog.\n"
 msgstr ""
 
-#: src/stored/mount.c:542
+#: src/stored/mount.c:564
 #, c-format
 msgid ""
 "Autochanger Volume \"%s\" not found in slot %d.\n"
 "    Setting InChanger to zero in catalog.\n"
 msgstr ""
 
-#: src/stored/mount.c:561
+#: src/stored/mount.c:583
 msgid "Hey!!!!! WroteVol non-zero !!!!!\n"
 msgstr ""
 
@@ -12888,42 +13284,42 @@ msgstr ""
 msgid "End of all volumes.\n"
 msgstr ""
 
-#: src/stored/read_record.c:128
+#: src/stored/read_record.c:129
 msgid "part"
 msgstr ""
 
-#: src/stored/read_record.c:131
+#: src/stored/read_record.c:132
 msgid "file"
 msgstr ""
 
-#: src/stored/read_record.c:134
+#: src/stored/read_record.c:135
 #, c-format
 msgid "End of %s %u on device %s, Volume \"%s\"\n"
 msgstr ""
 
-#: src/stored/read_record.c:148
+#: src/stored/read_record.c:149
 msgid "Did fsr in attemp to skip bad record.\n"
 msgstr ""
 
-#: src/stored/read_record.c:341
+#: src/stored/read_record.c:342
 #, c-format
 msgid "Reposition from (file:block) %u:%u to %u:%u\n"
 msgstr ""
 
-#: src/stored/read_record.c:369
+#: src/stored/read_record.c:370
 #, c-format
 msgid "Forward spacing Volume \"%s\" to file:block %u:%u.\n"
 msgstr ""
 
-#: src/stored/read_record.c:394
+#: src/stored/read_record.c:395
 msgid "Begin Session"
 msgstr ""
 
-#: src/stored/read_record.c:398
+#: src/stored/read_record.c:399
 msgid "End Session"
 msgstr ""
 
-#: src/stored/read_record.c:404
+#: src/stored/read_record.c:405
 #, c-format
 msgid "Unknown code %d\n"
 msgstr ""
@@ -12942,17 +13338,31 @@ msgstr ""
 msgid "Sanity check failed. maxlen=%d datalen=%d. Block discarded.\n"
 msgstr ""
 
-#: src/stored/reserve.c:88
+#: src/stored/reserve.c:93
 #, c-format
 msgid "Unable to initialize reservation lock. ERR=%s\n"
 msgstr ""
 
-#: src/stored/reserve.c:526 src/stored/reserve.c:537
+#: src/stored/reserve.c:99
+#, c-format
+msgid "Unable to initialize volume list lock. ERR=%s\n"
+msgstr ""
+
+#: src/stored/reserve.c:429
+#, c-format
+msgid "Hey! num_writers=%d!!!!\n"
+msgstr ""
+
+#: src/stored/reserve.c:643
+msgid "3939 Could not get dcr\n"
+msgstr ""
+
+#: src/stored/reserve.c:766 src/stored/reserve.c:777
 #, c-format
 msgid "Failed command: %s\n"
 msgstr ""
 
-#: src/stored/reserve.c:527
+#: src/stored/reserve.c:767
 #, c-format
 msgid ""
 "\n"
@@ -12960,390 +13370,421 @@ msgid ""
 "Device resources.\n"
 msgstr ""
 
-#: src/stored/reserve.c:722
+#: src/stored/reserve.c:1085
 #, c-format
 msgid "3926 Could not get dcr for device: %s\n"
 msgstr ""
 
-#: src/stored/reserve.c:787
+#: src/stored/reserve.c:1180
 #, c-format
 msgid "3601 JobId=%u device %s is BLOCKED due to user unmount.\n"
 msgstr ""
 
-#: src/stored/reserve.c:796
+#: src/stored/reserve.c:1190
 #, c-format
 msgid "3602 JobId=%u device %s is busy (already reading/writing).\n"
 msgstr ""
 
-#: src/stored/reserve.c:846
+#: src/stored/reserve.c:1237
 #, c-format
 msgid "3603 JobId=%u device %s is busy reading.\n"
 msgstr ""
 
-#: src/stored/reserve.c:855
+#: src/stored/reserve.c:1246
 #, c-format
 msgid "3604 JobId=%u device %s is BLOCKED due to user unmount.\n"
 msgstr ""
 
-#: src/stored/reserve.c:921
+#: src/stored/reserve.c:1314
 #, c-format
 msgid "3605 JobId=%u wants free drive but device %s is busy.\n"
 msgstr ""
 
-#: src/stored/reserve.c:929
+#: src/stored/reserve.c:1322
 #, c-format
 msgid "3606 JobId=%u prefers mounted drives, but drive %s has no Volume.\n"
 msgstr ""
 
-#: src/stored/reserve.c:939
+#: src/stored/reserve.c:1345
 #, c-format
 msgid "3607 JobId=%u wants Vol=\"%s\" drive has Vol=\"%s\" on drive %s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:975
+#: src/stored/reserve.c:1387
 #, c-format
-msgid "3608 JobId=%u wants Pool=\"%s\" but have Pool=\"%s\" on drive %s.\n"
+msgid ""
+"3608 JobId=%u wants Pool=\"%s\" but have Pool=\"%s\" nreserve=%d on drive %"
+"s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1018
+#: src/stored/reserve.c:1431
 #, c-format
 msgid "3609 JobId=%u wants Pool=\"%s\" but has Pool=\"%s\" on drive %s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1026 src/stored/reserve.c:1030
-msgid "Logic error!!!! Should not get here.\n"
+#: src/stored/reserve.c:1439
+#, c-format
+msgid "Logic error!!!! JobId=%u Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1027
+#: src/stored/reserve.c:1440
 #, c-format
 msgid "3910 JobId=%u Logic error!!!! drive %s Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1033
+#: src/stored/reserve.c:1443
+msgid "Logic error!!!! Should not get here.\n"
+msgstr ""
+
+#: src/stored/reserve.c:1446
 #, c-format
 msgid "3911 JobId=%u failed reserve drive %s.\n"
 msgstr ""
 
-#: src/stored/spool.c:86
+#: src/stored/spool.c:84
+msgid "Spooling statistics:\n"
+msgstr ""
+
+#: src/stored/spool.c:87
 #, c-format
 msgid ""
 "Data spooling: %u active jobs, %s bytes; %u total jobs, %s max bytes/job.\n"
 msgstr ""
 
-#: src/stored/spool.c:94
+#: src/stored/spool.c:95
 #, c-format
 msgid "Attr spooling: %u active jobs, %s bytes; %u total jobs, %s max bytes.\n"
 msgstr ""
 
-#: src/stored/spool.c:114
+#: src/stored/spool.c:115
 msgid "Spooling data ...\n"
 msgstr ""
 
-#: src/stored/spool.c:140
+#: src/stored/spool.c:141
 #, c-format
 msgid "Bad return from despool WroteVol=%d\n"
 msgstr ""
 
-#: src/stored/spool.c:173
+#: src/stored/spool.c:174
 #, c-format
 msgid "Open data spool file %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:226
+#: src/stored/spool.c:232
 #, c-format
 msgid "Committing spooled data to Volume \"%s\". Despooling %s bytes ...\n"
 msgstr ""
 
-#: src/stored/spool.c:230
+#: src/stored/spool.c:236
 #, c-format
 msgid "Writing spooled data to Volume. Despooling %s bytes ...\n"
 msgstr ""
 
-#: src/stored/spool.c:293
+#: src/stored/spool.c:306
 #, c-format
 msgid ""
 "Despooling elapsed time = %02d:%02d:%02d, Transfer rate = %s bytes/second\n"
 msgstr ""
 
-#: src/stored/spool.c:302 src/stored/spool.c:486 src/stored/spool.c:528
+#: src/stored/spool.c:315 src/stored/spool.c:504 src/stored/spool.c:546
 #, c-format
 msgid "Ftruncate spool file failed: ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:304
-#, c-format
-msgid "Bad return from ftruncate. ERR=%s\n"
-msgstr ""
-
-#: src/stored/spool.c:358
+#: src/stored/spool.c:376
 #, c-format
 msgid "Spool header read error. ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:361
+#: src/stored/spool.c:379
 #, c-format
 msgid "Spool read error. Wanted %u bytes, got %d\n"
 msgstr ""
 
-#: src/stored/spool.c:362
+#: src/stored/spool.c:380
 #, c-format
 msgid "Spool header read error. Wanted %u bytes, got %d\n"
 msgstr ""
 
-#: src/stored/spool.c:368 src/stored/spool.c:369
+#: src/stored/spool.c:386 src/stored/spool.c:387
 #, c-format
 msgid "Spool block too big. Max %u bytes, got %u\n"
 msgstr ""
 
-#: src/stored/spool.c:374 src/stored/spool.c:375
+#: src/stored/spool.c:392 src/stored/spool.c:393
 #, c-format
 msgid "Spool data read error. Wanted %u bytes, got %d\n"
 msgstr ""
 
-#: src/stored/spool.c:432
+#: src/stored/spool.c:450
 msgid "User specified spool size reached.\n"
 msgstr ""
 
-#: src/stored/spool.c:434
+#: src/stored/spool.c:452
 msgid "Bad return from despool in write_block.\n"
 msgstr ""
 
-#: src/stored/spool.c:442
+#: src/stored/spool.c:460
 msgid "Spooling data again ...\n"
 msgstr ""
 
-#: src/stored/spool.c:473
+#: src/stored/spool.c:491
 #, c-format
 msgid "Error writing header to spool file. ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:492 src/stored/spool.c:534
+#: src/stored/spool.c:510 src/stored/spool.c:552
 msgid "Fatal despooling error."
 msgstr ""
 
-#: src/stored/spool.c:499
+#: src/stored/spool.c:517
 msgid "Retrying after header spooling error failed.\n"
 msgstr ""
 
-#: src/stored/spool.c:513
+#: src/stored/spool.c:531
 #, c-format
 msgid "Error writing data to spool file. ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:544
+#: src/stored/spool.c:562
 msgid "Retrying after data spooling error failed.\n"
 msgstr ""
 
-#: src/stored/spool.c:599 src/stored/spool.c:606
+#: src/stored/spool.c:617 src/stored/spool.c:624
 #, c-format
 msgid "Fseek on attributes file failed: ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:616
+#: src/stored/spool.c:634
 #, c-format
 msgid "Sending spooled attrs to the Director. Despooling %s bytes ...\n"
 msgstr ""
 
-#: src/stored/spool.c:643
+#: src/stored/spool.c:661
 #, c-format
 msgid "fopen attr spool file %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/stored/status.c:113
+#: src/stored/status.c:120
 msgid ""
 "\n"
 "Device status:\n"
 msgstr ""
 
-#: src/stored/status.c:117
+#: src/stored/status.c:124
 #, c-format
 msgid "Autochanger \"%s\" with devices:\n"
 msgstr ""
 
-#: src/stored/status.c:135
+#: src/stored/status.c:142
 #, c-format
-msgid "Device %s is mounted with Volume=\"%s\" Pool=\"%s\"\n"
+msgid ""
+"Device %s is mounted with:\n"
+"    Volume:      %s\n"
+"    Pool:        %s\n"
+"    Media type:  %s\n"
 msgstr ""
 
-#: src/stored/status.c:140
+#: src/stored/status.c:152
 #, c-format
 msgid "Device %s open but no Bacula volume is currently mounted.\n"
 msgstr ""
 
-#: src/stored/status.c:151
+#: src/stored/status.c:163
 #, c-format
 msgid "    Total Bytes=%s Blocks=%s Bytes/block=%s\n"
 msgstr ""
 
-#: src/stored/status.c:166
+#: src/stored/status.c:178
 #, c-format
 msgid "    Total Bytes Read=%s Blocks Read=%s Bytes/block=%s\n"
 msgstr ""
 
-#: src/stored/status.c:172
+#: src/stored/status.c:184
 #, c-format
 msgid "    Positioned at File=%s Block=%s\n"
 msgstr ""
 
-#: src/stored/status.c:179
+#: src/stored/status.c:191
 #, c-format
 msgid "Device %s is not open.\n"
 msgstr ""
 
-#: src/stored/status.c:183
+#: src/stored/status.c:195
 #, c-format
 msgid "Device \"%s\" is not open or does not exist.\n"
 msgstr ""
 
-#: src/stored/status.c:189
+#: src/stored/status.c:201
 msgid "In Use Volume status:\n"
 msgstr ""
 
-#: src/stored/status.c:196 src/stored/status.c:198
+#: src/stored/status.c:208 src/stored/status.c:210
 msgid ""
 "====\n"
 "\n"
 msgstr ""
 
-#: src/stored/status.c:215
+#: src/stored/status.c:227
 msgid ""
 "No DEVICE structure.\n"
 "\n"
 msgstr ""
 
-#: src/stored/status.c:222
+#: src/stored/status.c:234
 msgid "    Device is BLOCKED. User unmounted.\n"
 msgstr ""
 
-#: src/stored/status.c:226
+#: src/stored/status.c:238
 msgid "    Device is BLOCKED. User unmounted during wait for media/mount.\n"
 msgstr ""
 
-#: src/stored/status.c:239
+#: src/stored/status.c:250
+#, c-format
+msgid ""
+"    Device is BLOCKED waiting for mount of volume \"%s\",\n"
+"       Pool:        %s\n"
+"       Media type:  %s\n"
+msgstr ""
+
+#: src/stored/status.c:259
 #, c-format
-msgid "    Device is BLOCKED waiting for mount of volume \"%s\".\n"
+msgid ""
+"    Device is BLOCKED waiting to create a volume for:\n"
+"       Pool:        %s\n"
+"       Media type:  %s\n"
 msgstr ""
 
-#: src/stored/status.c:248
+#: src/stored/status.c:271
 msgid "    Device is BLOCKED waiting for media.\n"
 msgstr ""
 
-#: src/stored/status.c:254
+#: src/stored/status.c:277
 msgid "    Device is being initialized.\n"
 msgstr ""
 
-#: src/stored/status.c:258
+#: src/stored/status.c:281
 msgid "    Device is blocked labeling a Volume.\n"
 msgstr ""
 
-#: src/stored/status.c:267
+#: src/stored/status.c:290
 #, c-format
 msgid "    Slot %d is loaded in drive %d.\n"
 msgstr ""
 
-#: src/stored/status.c:271
+#: src/stored/status.c:294
 #, c-format
 msgid "    Drive %d is not loaded.\n"
 msgstr ""
 
-#: src/stored/status.c:274
+#: src/stored/status.c:297
 #, c-format
 msgid "    Drive %d status unknown.\n"
 msgstr ""
 
-#: src/stored/status.c:297
+#: src/stored/status.c:320
 msgid "Device state:\n"
 msgstr ""
 
-#: src/stored/status.c:315
+#: src/stored/status.c:338
 #, c-format
 msgid ""
 "num_writers=%d block=%d\n"
 "\n"
 msgstr ""
 
-#: src/stored/status.c:321
+#: src/stored/status.c:344
 #, c-format
 msgid "Archive name: %s Device name: %s\n"
 msgstr ""
 
-#: src/stored/status.c:325
+#: src/stored/status.c:348
 #, c-format
 msgid "File=%u block=%u\n"
 msgstr ""
 
-#: src/stored/status.c:328
+#: src/stored/status.c:351
 #, c-format
 msgid "Min block=%u Max block=%u\n"
 msgstr ""
 
-#: src/stored/status.c:352
+#: src/stored/status.c:375
 #, c-format
 msgid "%s Job %s waiting for Client connection.\n"
 msgstr ""
 
-#: src/stored/status.c:368
+#: src/stored/status.c:391
 #, c-format
 msgid ""
 "Reading: %s %s job %s JobId=%d Volume=\"%s\"\n"
-"    pool=\"%s\" device=\"%s\"\n"
+"    pool=\"%s\" device=%s\n"
 msgstr ""
 
-#: src/stored/status.c:381
+#: src/stored/status.c:404
 #, c-format
 msgid ""
 "Writing: %s %s job %s JobId=%d Volume=\"%s\"\n"
-"    pool=\"%s\" device=\"%s\"\n"
+"    pool=\"%s\" device=%s\n"
 msgstr ""
 
-#: src/stored/status.c:406
+#: src/stored/status.c:415
+#, c-format
+msgid "    spooling=%d despooling=%d despool_wait=%d\n"
+msgstr ""
+
+#: src/stored/status.c:424
+#, c-format
+msgid "    Files=%s Bytes=%s Bytes/sec=%s\n"
+msgstr ""
+
+#: src/stored/status.c:432
 #, c-format
 msgid "    FDReadSeqNo=%s in_msg=%u out_msg=%d fd=%d\n"
 msgstr ""
 
-#: src/stored/status.c:412
+#: src/stored/status.c:438
 msgid "    FDSocket closed\n"
 msgstr ""
 
-#: src/stored/status.c:434
+#: src/stored/status.c:460
 msgid ""
 "\n"
 "Jobs waiting to reserve a drive:\n"
 msgstr ""
 
-#: src/stored/status.c:465
+#: src/stored/status.c:491
 msgid "===================================================================\n"
 msgstr ""
 
-#: src/stored/status.c:611
+#: src/stored/status.c:637
 msgid "3900 Bad .status command, missing argument.\n"
 msgstr ""
 
-#: src/stored/status.c:634
+#: src/stored/status.c:660
 msgid "3900 Bad .status command, wrong argument.\n"
 msgstr ""
 
-#: src/stored/status.c:648
+#: src/stored/status.c:674
 msgid "Bacula Storage: Idle"
 msgstr ""
 
-#: src/stored/status.c:659
+#: src/stored/status.c:685
 msgid "Bacula Storage: Running"
 msgstr ""
 
-#: src/stored/status.c:673
+#: src/stored/status.c:699
 msgid "Bacula Storage: Last Job Canceled"
 msgstr ""
 
-#: src/stored/status.c:677
+#: src/stored/status.c:703
 msgid "Bacula Storage: Last Job Failed"
 msgstr ""
 
-#: src/stored/status.c:681
+#: src/stored/status.c:707
 msgid "Bacula Storage: Last Job had Warnings"
 msgstr ""
 
-#: src/stored/stored.c:81
+#: src/stored/stored.c:82
 #, c-format
 msgid ""
 "\n"
@@ -13363,46 +13804,46 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/stored/stored.c:241
+#: src/stored/stored.c:243
 msgid "Volume Session Time is ZERO!\n"
 msgstr ""
 
-#: src/stored/stored.c:254
+#: src/stored/stored.c:256
 #, c-format
 msgid "Unable to create thread. ERR=%s\n"
 msgstr ""
 
-#: src/stored/stored.c:292
+#: src/stored/stored.c:294
 #, c-format
 msgid "Only one Storage resource permitted in %s\n"
 msgstr ""
 
-#: src/stored/stored.c:297
+#: src/stored/stored.c:299
 #, c-format
 msgid "No Director resource defined in %s. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/stored.c:302
+#: src/stored/stored.c:304
 #, c-format
 msgid "No Device resource defined in %s. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/stored.c:310
+#: src/stored/stored.c:312
 #, c-format
 msgid "No Messages resource defined in %s. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/stored.c:337
+#: src/stored/stored.c:339
 #, c-format
 msgid "\"TLS Certificate\" file not defined for Storage \"%s\" in %s.\n"
 msgstr ""
 
-#: src/stored/stored.c:343
+#: src/stored/stored.c:345
 #, c-format
 msgid "\"TLS Key\" file not defined for Storage \"%s\" in %s.\n"
 msgstr ""
 
-#: src/stored/stored.c:349
+#: src/stored/stored.c:351
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -13410,57 +13851,57 @@ msgid ""
 "using \"TLS Verify Peer\".\n"
 msgstr ""
 
-#: src/stored/stored.c:480
+#: src/stored/stored.c:482
 #, c-format
 msgid "Could not initialize %s\n"
 msgstr ""
 
-#: src/stored/stored.c:493
+#: src/stored/stored.c:495
 #, c-format
 msgid "Could not open device %s\n"
 msgstr ""
 
-#: src/stored/stored.c:506
+#: src/stored/stored.c:508
 #, c-format
 msgid "Could not mount device %s\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:233
+#: src/stored/stored_conf.c:234
 #, c-format
 msgid "Expected a Device Type keyword, got: %s"
 msgstr ""
 
-#: src/stored/stored_conf.c:248
+#: src/stored/stored_conf.c:249
 #, c-format
 msgid "Warning: no \"%s\" resource (%d) defined.\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:251
+#: src/stored/stored_conf.c:252
 #, c-format
 msgid "dump_resource type=%d\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:367
+#: src/stored/stored_conf.c:368
 #, c-format
 msgid "Warning: unknown resource type %d\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:556
+#: src/stored/stored_conf.c:557
 #, c-format
 msgid "\"%s\" item is required in \"%s\" resource, but not found.\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:562
+#: src/stored/stored_conf.c:563
 #, c-format
 msgid "Too many items in \"%s\" resource\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:596
+#: src/stored/stored_conf.c:597
 #, c-format
 msgid "Cannot find AutoChanger resource %s\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:667
+#: src/stored/stored_conf.c:669
 #, c-format
 msgid ""
 "Attempt to define second \"%s\" resource named \"%s\" is not permitted.\n"
@@ -13471,9 +13912,9 @@ msgstr ""
 msgid "pthread timedwait error. ERR=%s\n"
 msgstr ""
 
-#: src/stored/wait.c:212
+#: src/stored/wait.c:217
 #, c-format
-msgid "Job %s waiting to reserve a device.\n"
+msgid "JobId=%s, Job %s waiting to reserve a device.\n"
 msgstr ""
 
 #: src/tools/bregex.c:147 src/tools/bwild.c:122
@@ -13481,21 +13922,22 @@ msgstr ""
 msgid "Could not open data file: %s\n"
 msgstr ""
 
-#: src/tools/bsmtp.c:92
+#: src/tools/bsmtp.c:117
 #, c-format
 msgid "Fatal malformed reply from %s: %s\n"
 msgstr ""
 
-#: src/tools/bsmtp.c:100
+#: src/tools/bsmtp.c:125
 #, c-format
 msgid "Fatal fgets error: ERR=%s\n"
 msgstr ""
 
-#: src/tools/bsmtp.c:131
+#: src/tools/bsmtp.c:156
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [-f from] [-h mailhost] [-s subject] [-c copy] [recipient ...]\n"
+"       -8          set charset utf-8\n"
 "       -c          set the Cc: field\n"
 "       -dnn        set debug level to nn\n"
 "       -f          set the From: field\n"
@@ -13508,56 +13950,56 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tools/bsmtp.c:228
+#: src/tools/bsmtp.c:287
 msgid "Fatal error: no recipient given.\n"
 msgstr ""
 
-#: src/tools/bsmtp.c:259
+#: src/tools/bsmtp.c:316
 #, c-format
 msgid "Fatal gethostname error: ERR=%s\n"
 msgstr ""
 
-#: src/tools/bsmtp.c:263
+#: src/tools/bsmtp.c:320
 #, c-format
 msgid "Fatal gethostbyname for myself failed \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/tools/bsmtp.c:299
+#: src/tools/bsmtp.c:356
 #, c-format
 msgid "Error unknown mail host \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/tools/bsmtp.c:302
+#: src/tools/bsmtp.c:359
 msgid "Retrying connection using \"localhost\".\n"
 msgstr ""
 
-#: src/tools/bsmtp.c:310
+#: src/tools/bsmtp.c:367
 #, c-format
 msgid "Fatal error: Unknown address family for smtp host: %d\n"
 msgstr ""
 
-#: src/tools/bsmtp.c:319 src/tools/bsmtp.c:324
+#: src/tools/bsmtp.c:376 src/tools/bsmtp.c:381
 #, c-format
 msgid "Fatal socket error: ERR=%s\n"
 msgstr ""
 
-#: src/tools/bsmtp.c:329
+#: src/tools/bsmtp.c:386
 #, c-format
 msgid "Fatal connect error to %s: ERR=%s\n"
 msgstr ""
 
-#: src/tools/bsmtp.c:337
+#: src/tools/bsmtp.c:394
 #, c-format
 msgid "Fatal _open_osfhandle error: ERR=%s\n"
 msgstr ""
 
-#: src/tools/bsmtp.c:344 src/tools/bsmtp.c:348 src/tools/bsmtp.c:357
-#: src/tools/bsmtp.c:361
+#: src/tools/bsmtp.c:401 src/tools/bsmtp.c:405 src/tools/bsmtp.c:414
+#: src/tools/bsmtp.c:418
 #, c-format
 msgid "Fatal fdopen error: ERR=%s\n"
 msgstr ""
 
-#: src/tools/bsmtp.c:353
+#: src/tools/bsmtp.c:410
 #, c-format
 msgid "Fatal dup error: ERR=%s\n"
 msgstr ""
@@ -13705,213 +14147,213 @@ msgstr ""
 msgid "Orphaned ClientId=%s Name=\"%s\"\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:519
+#: src/tools/dbcheck.c:520
 #, c-format
 msgid "Deleting: %s\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:593
+#: src/tools/dbcheck.c:594
 #, c-format
 msgid "Checking for duplicate Filename entries.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:602
+#: src/tools/dbcheck.c:603
 #, c-format
 msgid "Found %d duplicate Filename records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:603
+#: src/tools/dbcheck.c:604
 msgid "Print the list? (yes/no): "
 msgstr ""
 
-#: src/tools/dbcheck.c:622 src/tools/dbcheck.c:679
+#: src/tools/dbcheck.c:623 src/tools/dbcheck.c:681
 #, c-format
 msgid "Found %d for: %s\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:649
+#: src/tools/dbcheck.c:651
 #, c-format
 msgid "Checking for duplicate Path entries.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:659
+#: src/tools/dbcheck.c:661
 #, c-format
 msgid "Found %d duplicate Path records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:660 src/tools/dbcheck.c:713 src/tools/dbcheck.c:748
-#: src/tools/dbcheck.c:782 src/tools/dbcheck.c:812 src/tools/dbcheck.c:842
-#: src/tools/dbcheck.c:882 src/tools/dbcheck.c:922 src/tools/dbcheck.c:959
-#: src/tools/dbcheck.c:991 src/tools/dbcheck.c:1027 src/tools/dbcheck.c:1087
+#: src/tools/dbcheck.c:662 src/tools/dbcheck.c:716 src/tools/dbcheck.c:760
+#: src/tools/dbcheck.c:803 src/tools/dbcheck.c:842 src/tools/dbcheck.c:880
+#: src/tools/dbcheck.c:921 src/tools/dbcheck.c:962 src/tools/dbcheck.c:1000
+#: src/tools/dbcheck.c:1033 src/tools/dbcheck.c:1070 src/tools/dbcheck.c:1134
 msgid "Print them? (yes/no): "
 msgstr ""
 
-#: src/tools/dbcheck.c:705
+#: src/tools/dbcheck.c:709
 #, c-format
 msgid "Checking for orphaned JobMedia entries.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:712
+#: src/tools/dbcheck.c:715
 #, c-format
 msgid "Found %d orphaned JobMedia records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:728
+#: src/tools/dbcheck.c:733
 #, c-format
 msgid "Deleting %d orphaned JobMedia records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:737
+#: src/tools/dbcheck.c:750
 #, c-format
 msgid "Checking for orphaned File entries. This may take some time!\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:747
+#: src/tools/dbcheck.c:759
 #, c-format
 msgid "Found %d orphaned File records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:762
+#: src/tools/dbcheck.c:776
 #, c-format
 msgid "Deleting %d orphaned File records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:771
+#: src/tools/dbcheck.c:793
 #, c-format
 msgid "Checking for orphaned Path entries. This may take some time!\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:781
+#: src/tools/dbcheck.c:802
 #, c-format
 msgid "Found %d orphaned Path records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:792
+#: src/tools/dbcheck.c:815
 #, c-format
 msgid "Deleting %d orphaned Path records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:801
+#: src/tools/dbcheck.c:832
 #, c-format
 msgid "Checking for orphaned Filename entries. This may take some time!\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:811
+#: src/tools/dbcheck.c:841
 #, c-format
 msgid "Found %d orphaned Filename records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:822
+#: src/tools/dbcheck.c:854
 #, c-format
 msgid "Deleting %d orphaned Filename records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:831
+#: src/tools/dbcheck.c:869
 #, c-format
 msgid "Checking for orphaned FileSet entries. This takes some time!\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:841
+#: src/tools/dbcheck.c:879
 #, c-format
 msgid "Found %d orphaned FileSet records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:855
+#: src/tools/dbcheck.c:894
 #, c-format
 msgid "Deleting %d orphaned FileSet records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:864
+#: src/tools/dbcheck.c:903
 #, c-format
 msgid "Checking for orphaned Client entries.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:881
+#: src/tools/dbcheck.c:920
 #, c-format
 msgid "Found %d orphaned Client records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:895
+#: src/tools/dbcheck.c:935
 #, c-format
 msgid "Deleting %d orphaned Client records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:904
+#: src/tools/dbcheck.c:944
 #, c-format
 msgid "Checking for orphaned Job entries.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:921
+#: src/tools/dbcheck.c:961
 #, c-format
 msgid "Found %d orphaned Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:935
+#: src/tools/dbcheck.c:976
 #, c-format
 msgid "Deleting %d orphaned Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:937
+#: src/tools/dbcheck.c:978
 #, c-format
 msgid "Deleting JobMedia records of orphaned Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:939
+#: src/tools/dbcheck.c:980
 #, c-format
 msgid "Deleting Log records of orphaned Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:949
+#: src/tools/dbcheck.c:990
 #, c-format
 msgid "Checking for Admin Job entries.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:958
+#: src/tools/dbcheck.c:999
 #, c-format
 msgid "Found %d Admin Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:972
+#: src/tools/dbcheck.c:1014
 #, c-format
 msgid "Deleting %d Admin Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:981
+#: src/tools/dbcheck.c:1023
 #, c-format
 msgid "Checking for Restore Job entries.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:990
+#: src/tools/dbcheck.c:1032
 #, c-format
 msgid "Found %d Restore Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1004
+#: src/tools/dbcheck.c:1047
 #, c-format
 msgid "Deleting %d Restore Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1017
+#: src/tools/dbcheck.c:1060
 #, c-format
 msgid "Checking for Filenames with a trailing slash\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1026
+#: src/tools/dbcheck.c:1069
 #, c-format
 msgid "Found %d bad Filename records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1042 src/tools/dbcheck.c:1102
+#: src/tools/dbcheck.c:1087 src/tools/dbcheck.c:1150
 #, c-format
 msgid "Reparing %d bad Filename records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1077
+#: src/tools/dbcheck.c:1124
 #, c-format
 msgid "Checking for Paths without a trailing slash\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1086
+#: src/tools/dbcheck.c:1133
 #, c-format
 msgid "Found %d bad Path records.\n"
 msgstr ""
@@ -14130,7 +14572,7 @@ msgid ""
 "help.\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:110
+#: src/tray-monitor/tray-monitor.c:113
 #, c-format
 msgid ""
 "Written by Nicolas Boichat (2004)\n"
@@ -14145,22 +14587,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:258
+#: src/tray-monitor/tray-monitor.c:262
 #, c-format
 msgid ""
-"Error: %d Monitor resource defined in %s. You must define one and only one "
+"Error: %d Monitor resources defined in %s. You must define one and only one "
 "Monitor resource.\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:289
+#: src/tray-monitor/tray-monitor.c:293
 #, c-format
 msgid ""
-"No Client, Storage nor Director resource defined in %s\n"
+"No Client, Storage or Director resource defined in %s\n"
 "Without that I don't how to get status from the File, Storage or Director "
 "Daemon :-(\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:311
+#: src/tray-monitor/tray-monitor.c:315
 #, c-format
 msgid ""
 "Invalid refresh interval defined in %s\n"
@@ -14168,310 +14610,310 @@ msgid ""
 "minutes (read value: %d).\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:326
+#: src/tray-monitor/tray-monitor.c:330
 msgid "Open status window..."
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:332
+#: src/tray-monitor/tray-monitor.c:336
 msgid "Exit"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:344
+#: src/tray-monitor/tray-monitor.c:348
 msgid "Bacula tray monitor"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:369
+#: src/tray-monitor/tray-monitor.c:373
 msgid " (DIR)"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:373
+#: src/tray-monitor/tray-monitor.c:377
 msgid " (FD)"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:377
+#: src/tray-monitor/tray-monitor.c:381
 msgid " (SD)"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:390
+#: src/tray-monitor/tray-monitor.c:394
 msgid "Unknown status."
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:431
+#: src/tray-monitor/tray-monitor.c:464
 msgid "Refresh interval in seconds: "
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:439
+#: src/tray-monitor/tray-monitor.c:472
 msgid "Refresh now"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:443
+#: src/tray-monitor/tray-monitor.c:476
 msgid "About"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:447
+#: src/tray-monitor/tray-monitor.c:480
 msgid "Close"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:467
+#: src/tray-monitor/tray-monitor.c:500
 #, c-format
 msgid "Disconnecting from Director %s:%d\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:470
+#: src/tray-monitor/tray-monitor.c:503
 #, c-format
 msgid "Disconnecting from Client %s:%d\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:473
+#: src/tray-monitor/tray-monitor.c:506
 #, c-format
 msgid "Disconnecting from Storage %s:%d\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:510 src/tray-monitor/tray-monitor.c:521
+#: src/tray-monitor/tray-monitor.c:543 src/tray-monitor/tray-monitor.c:554
 msgid "Bacula Tray Monitor"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:512 src/tray-monitor/tray-monitor.c:523
+#: src/tray-monitor/tray-monitor.c:545 src/tray-monitor/tray-monitor.c:556
 msgid "Written by Nicolas Boichat\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:513 src/tray-monitor/tray-monitor.c:524
+#: src/tray-monitor/tray-monitor.c:546 src/tray-monitor/tray-monitor.c:557
 msgid "Version"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:592
+#: src/tray-monitor/tray-monitor.c:625
 #, c-format
 msgid "Error, currentitem is not a Client or a Storage..\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:666
+#: src/tray-monitor/tray-monitor.c:699
 #, c-format
 msgid ""
 "Current job: %s\n"
 "Last job: %s"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:678
+#: src/tray-monitor/tray-monitor.c:711
 #, c-format
 msgid " (%d errors)"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:681
+#: src/tray-monitor/tray-monitor.c:714
 #, c-format
 msgid " (%d error)"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:719
+#: src/tray-monitor/tray-monitor.c:752
 msgid "No current job."
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:722
+#: src/tray-monitor/tray-monitor.c:755
 msgid "No last job."
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:730
+#: src/tray-monitor/tray-monitor.c:763
 msgid "Job status: Created"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:735
+#: src/tray-monitor/tray-monitor.c:768
 msgid "Job status: Running"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:739
+#: src/tray-monitor/tray-monitor.c:772
 msgid "Job status: Blocked"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:744
+#: src/tray-monitor/tray-monitor.c:777
 msgid "Job status: Terminated"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:749
+#: src/tray-monitor/tray-monitor.c:782
 msgid "Job status: Terminated in error"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:755
+#: src/tray-monitor/tray-monitor.c:788
 msgid "Job status: Error"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:759
+#: src/tray-monitor/tray-monitor.c:792
 msgid "Job status: Fatal error"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:764
+#: src/tray-monitor/tray-monitor.c:797
 msgid "Job status: Verify differences"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:769
+#: src/tray-monitor/tray-monitor.c:802
 msgid "Job status: Canceled"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:774
+#: src/tray-monitor/tray-monitor.c:807
 msgid "Job status: Waiting on File daemon"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:779
+#: src/tray-monitor/tray-monitor.c:812
 msgid "Job status: Waiting on the Storage daemon"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:784
+#: src/tray-monitor/tray-monitor.c:817
 msgid "Job status: Waiting for new media"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:789
+#: src/tray-monitor/tray-monitor.c:822
 msgid "Job status: Waiting for Mount"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:794
+#: src/tray-monitor/tray-monitor.c:827
 msgid "Job status: Waiting for storage resource"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:799
+#: src/tray-monitor/tray-monitor.c:832
 msgid "Job status: Waiting for job resource"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:804
+#: src/tray-monitor/tray-monitor.c:837
 msgid "Job status: Waiting for Client resource"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:809
+#: src/tray-monitor/tray-monitor.c:842
 msgid "Job status: Waiting for maximum jobs"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:814
+#: src/tray-monitor/tray-monitor.c:847
 msgid "Job status: Waiting for start time"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:819
+#: src/tray-monitor/tray-monitor.c:852
 msgid "Job status: Waiting for higher priority jobs to finish"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:824
+#: src/tray-monitor/tray-monitor.c:857
 #, c-format
 msgid "Unknown job status %c."
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:825
+#: src/tray-monitor/tray-monitor.c:858
 #, c-format
 msgid "Job status: Unknown(%c)"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:832
+#: src/tray-monitor/tray-monitor.c:865
 #, c-format
 msgid "Bad scan : '%s' %d\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:873
+#: src/tray-monitor/tray-monitor.c:906
 #, c-format
 msgid "Connecting to Director %s:%d"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:879
+#: src/tray-monitor/tray-monitor.c:912
 #, c-format
 msgid "Connecting to Client %s:%d\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:880
+#: src/tray-monitor/tray-monitor.c:913
 #, c-format
 msgid "Connecting to Client %s:%d"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:886
+#: src/tray-monitor/tray-monitor.c:919
 #, c-format
 msgid "Connecting to Storage %s:%d\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:887
+#: src/tray-monitor/tray-monitor.c:920
 #, c-format
 msgid "Connecting to Storage %s:%d"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:892 src/tray-monitor/tray-monitor.c:930
+#: src/tray-monitor/tray-monitor.c:925 src/tray-monitor/tray-monitor.c:963
 #, c-format
 msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:898
+#: src/tray-monitor/tray-monitor.c:931
 msgid "Cannot connect to daemon.\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:899
+#: src/tray-monitor/tray-monitor.c:932
 msgid "Cannot connect to daemon."
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:911
+#: src/tray-monitor/tray-monitor.c:944
 #, c-format
 msgid "Authentication error : %s"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:918
+#: src/tray-monitor/tray-monitor.c:951
 msgid "Opened connection with Director daemon.\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:919
+#: src/tray-monitor/tray-monitor.c:952
 msgid "Opened connection with Director daemon."
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:922
+#: src/tray-monitor/tray-monitor.c:955
 msgid "Opened connection with File daemon.\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:923
+#: src/tray-monitor/tray-monitor.c:956
 msgid "Opened connection with File daemon."
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:926
+#: src/tray-monitor/tray-monitor.c:959
 msgid "Opened connection with Storage daemon.\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:927
+#: src/tray-monitor/tray-monitor.c:960
 msgid "Opened connection with Storage daemon."
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:964
+#: src/tray-monitor/tray-monitor.c:997
 msgid "<< Error: BNET_PROMPT signal received. >>\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:969 src/wx-console/console_thread.cpp:486
+#: src/tray-monitor/tray-monitor.c:1002 src/wx-console/console_thread.cpp:486
 msgid "<< Heartbeat signal received, answered. >>\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:973
+#: src/tray-monitor/tray-monitor.c:1006
 #, c-format
 msgid "<< Unexpected signal received : %s >>\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:978
+#: src/tray-monitor/tray-monitor.c:1011
 msgid "<ERROR>\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:982
+#: src/tray-monitor/tray-monitor.c:1015
 msgid "Error : BNET_HARDEOF or BNET_ERROR"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:988
+#: src/tray-monitor/tray-monitor.c:1021
 msgid "<STOP>\n"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:992
+#: src/tray-monitor/tray-monitor.c:1025
 msgid "Error : Connection closed."
 msgstr ""
 
-#: src/tray-monitor/tray_conf.c:169
+#: src/tray-monitor/tray_conf.c:177
 #, c-format
 msgid "Monitor: name=%s FDtimeout=%s SDtimeout=%s\n"
 msgstr ""
 
-#: src/tray-monitor/tray_conf.c:175
+#: src/tray-monitor/tray_conf.c:183
 #, c-format
 msgid "Director: name=%s address=%s FDport=%d\n"
 msgstr ""
 
-#: src/tray-monitor/tray_conf.c:179
+#: src/tray-monitor/tray_conf.c:187
 #, c-format
 msgid "Client: name=%s address=%s FDport=%d\n"
 msgstr ""
 
-#: src/tray-monitor/tray_conf.c:183
+#: src/tray-monitor/tray_conf.c:191
 #, c-format
 msgid "Storage: name=%s address=%s SDport=%d\n"
 msgstr ""
@@ -14490,13 +14932,13 @@ msgid "*None*"
 msgstr ""
 
 #: src/win32/dird/winmain.cpp:193 src/win32/dird/winmain.cpp:200
-#: src/win32/filed/winmain.cpp:223 src/win32/filed/winmain.cpp:230
+#: src/win32/filed/winmain.cpp:224 src/win32/filed/winmain.cpp:231
 #: src/win32/stored/baculasd/winmain.cpp:225
 #: src/win32/stored/baculasd/winmain.cpp:232
 msgid "Bacula Usage"
 msgstr ""
 
-#: src/win32/dird/winmain.cpp:197 src/win32/filed/winmain.cpp:227
+#: src/win32/dird/winmain.cpp:197 src/win32/filed/winmain.cpp:228
 #: src/win32/stored/baculasd/winmain.cpp:229
 msgid "Bad Command Line Options"
 msgstr ""
@@ -14596,19 +15038,19 @@ msgid ""
 "%s error: %ld at %s:%d"
 msgstr ""
 
-#: src/win32/dird/winservice.cpp:496 src/win32/filed/winservice.cpp:707
+#: src/win32/dird/winservice.cpp:496 src/win32/filed/winservice.cpp:706
 #: src/win32/stored/baculasd/winservice.cpp:546
 #, c-format
 msgid "Locked by: %s, duration: %ld seconds\n"
 msgstr ""
 
-#: src/win32/dird/winservice.cpp:500 src/win32/filed/winservice.cpp:711
+#: src/win32/dird/winservice.cpp:500 src/win32/filed/winservice.cpp:710
 #: src/win32/stored/baculasd/winservice.cpp:550
 #, c-format
 msgid "No longer locked\n"
 msgstr ""
 
-#: src/win32/dird/winservice.cpp:504 src/win32/filed/winservice.cpp:715
+#: src/win32/dird/winservice.cpp:504 src/win32/filed/winservice.cpp:714
 #: src/win32/stored/baculasd/winservice.cpp:554
 msgid "Could not lock database"
 msgstr ""
@@ -14862,13 +15304,13 @@ msgstr ""
 msgid "Connection terminated\n"
 msgstr ""
 
-#: src/wx-console/main.cpp:118
-msgid "Bacula wx-console"
+#: src/wx-console/main.cpp:119
+msgid "Bacula bwx-console"
 msgstr ""
 
-#: src/wx-console/main.cpp:123 src/wx-console/wxbmainframe.cpp:267
+#: src/wx-console/main.cpp:124 src/wx-console/wxbmainframe.cpp:267
 #, c-format
-msgid "Welcome to bacula wx-console %s (%s)!\n"
+msgid "Welcome to bacula bwx-console %s (%s)!\n"
 msgstr ""
 
 #: src/wx-console/wxbconfigfileeditor.cpp:65
@@ -14876,7 +15318,7 @@ msgid "Config file editor"
 msgstr ""
 
 #: src/wx-console/wxbconfigfileeditor.cpp:75
-msgid "# Bacula wx-console Configuration File\n"
+msgid "# Bacula bwx-console Configuration File\n"
 msgstr ""
 
 #: src/wx-console/wxbconfigfileeditor.cpp:111
@@ -14922,7 +15364,7 @@ msgstr ""
 msgid "Show about dialog"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:248 src/wx-console/wxbmainframe.cpp:617
+#: src/wx-console/wxbmainframe.cpp:248 src/wx-console/wxbmainframe.cpp:620
 msgid "Connect to the director"
 msgstr ""
 
@@ -14972,7 +15414,7 @@ msgid ""
 "Warning : There is a problem with wxWidgets for GTK+ 2.0 without Unicode "
 "support when handling non-ASCII filenames: Every non-ASCII character in such "
 "filenames will be replaced by an interrogation mark.\n"
-"If this behaviour disturbs you, please build wx-console against a Unicode "
+"If this behaviour disturbs you, please build bwx-console against a Unicode "
 "version of wxWidgets for GTK+ 2.0.\n"
 "---\n"
 msgstr ""
@@ -14986,23 +15428,23 @@ msgid "Error while parsing command line arguments, using defaults.\n"
 msgstr ""
 
 #: src/wx-console/wxbmainframe.cpp:376 src/wx-console/wxbmainframe.cpp:388
-msgid "Usage: wx-console [-c configfile] [-w tmp]\n"
+msgid "Usage: bwx-console [-c configfile] [-w tmp]\n"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:416
+#: src/wx-console/wxbmainframe.cpp:417
 #, c-format
 msgid ""
-"It seems that it is the first time you run wx-console.\n"
+"It seems that it is the first time you run bwx-console.\n"
 "This file (%s) has been choosen as default configuration file.\n"
 "Do you want to edit it? (if you click No you will have to select another "
 "file)"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:418
+#: src/wx-console/wxbmainframe.cpp:419
 msgid "First run"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:435
+#: src/wx-console/wxbmainframe.cpp:436
 #, c-format
 msgid ""
 "Unable to read %s\n"
@@ -15010,479 +15452,479 @@ msgid ""
 "Do you want to choose another one? (Press no to edit this file)"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:437
+#: src/wx-console/wxbmainframe.cpp:438
 msgid "Unable to read configuration file"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:449
+#: src/wx-console/wxbmainframe.cpp:450
 msgid "Please choose a configuration file to use"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:462
+#: src/wx-console/wxbmainframe.cpp:463
 msgid "This configuration file has been successfully read, use it as default?"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:463
+#: src/wx-console/wxbmainframe.cpp:464
 msgid "Configuration file read successfully"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:473
+#: src/wx-console/wxbmainframe.cpp:474
 #, c-format
 msgid "Using this configuration file: %s\n"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:478
+#: src/wx-console/wxbmainframe.cpp:479
 msgid "Connecting to the director..."
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:493
+#: src/wx-console/wxbmainframe.cpp:494
 msgid "Failed to unregister a data parser !"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:501
+#: src/wx-console/wxbmainframe.cpp:502
 msgid "Quitting.\n"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:516
+#: src/wx-console/wxbmainframe.cpp:517
 msgid ""
-"Welcome to Bacula wx-console.\n"
+"Welcome to Bacula bwx-console.\n"
 "Written by Nicolas Boichat <nicolas@boichat.ch>\n"
-"(C) 2005 Kern Sibbald\n"
+"Copyright (C), 2005-2007 Free Software Foundation Europe, e.V.\n"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:518
-msgid "About Bacula wx-console"
+#: src/wx-console/wxbmainframe.cpp:521
+msgid "About Bacula bwx-console"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:524
+#: src/wx-console/wxbmainframe.cpp:527
 msgid "Please choose your default configuration file"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:528
+#: src/wx-console/wxbmainframe.cpp:531
 msgid "Use this configuration file as default?"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:529
+#: src/wx-console/wxbmainframe.cpp:532
 msgid "Configuration file"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:600
+#: src/wx-console/wxbmainframe.cpp:603
 msgid "Console thread terminated."
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:608
+#: src/wx-console/wxbmainframe.cpp:611
 msgid "Connection to the director lost. Quit program?"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:609
+#: src/wx-console/wxbmainframe.cpp:612
 msgid "Connection lost"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:625
+#: src/wx-console/wxbmainframe.cpp:628
 msgid "Connected to the director."
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:648
+#: src/wx-console/wxbmainframe.cpp:651
 msgid "Reconnect"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:649
+#: src/wx-console/wxbmainframe.cpp:652
 msgid "Reconnect to the director"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:663
+#: src/wx-console/wxbmainframe.cpp:666
 msgid "Disconnected of the director."
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:682 src/wx-console/wxbrestorepanel.cpp:709
+#: src/wx-console/wxbmainframe.cpp:685 src/wx-console/wxbrestorepanel.cpp:710
 msgid "Unexpected question has been received.\n"
 msgstr ""
 
-#: src/wx-console/wxbmainframe.cpp:705 src/wx-console/wxbmainframe.cpp:722
-msgid "wx-console: unexpected director's question."
+#: src/wx-console/wxbmainframe.cpp:708 src/wx-console/wxbmainframe.cpp:725
+msgid "bwx-console: unexpected director's question."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:233
-#: src/wx-console/wxbrestorepanel.cpp:1918
-#: src/wx-console/wxbrestorepanel.cpp:1947
+#: src/wx-console/wxbrestorepanel.cpp:234
+#: src/wx-console/wxbrestorepanel.cpp:1920
+#: src/wx-console/wxbrestorepanel.cpp:1949
 msgid "Enter restore mode"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:236
+#: src/wx-console/wxbrestorepanel.cpp:237
 msgid "Cancel restore"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:262
-#: src/wx-console/wxbrestorepanel.cpp:316
+#: src/wx-console/wxbrestorepanel.cpp:263
+#: src/wx-console/wxbrestorepanel.cpp:317
 msgid "Add"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:264
-#: src/wx-console/wxbrestorepanel.cpp:318
+#: src/wx-console/wxbrestorepanel.cpp:265
+#: src/wx-console/wxbrestorepanel.cpp:319
 msgid "Remove"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:266
-#: src/wx-console/wxbrestorepanel.cpp:320
+#: src/wx-console/wxbrestorepanel.cpp:267
+#: src/wx-console/wxbrestorepanel.cpp:321
 msgid "Refresh"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:285
+#: src/wx-console/wxbrestorepanel.cpp:286
 msgid "M"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:289
+#: src/wx-console/wxbrestorepanel.cpp:290
 msgid "Filename"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:301
+#: src/wx-console/wxbrestorepanel.cpp:302
 msgid "Perm."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:334
-#: src/wx-console/wxbrestorepanel.cpp:347
-#: src/wx-console/wxbrestorepanel.cpp:502
-#: src/wx-console/wxbrestorepanel.cpp:512
-#: src/wx-console/wxbrestorepanel.cpp:515
-#: src/wx-console/wxbrestorepanel.cpp:1783
-#: src/wx-console/wxbrestorepanel.cpp:1869
+#: src/wx-console/wxbrestorepanel.cpp:335
+#: src/wx-console/wxbrestorepanel.cpp:348
+#: src/wx-console/wxbrestorepanel.cpp:503
+#: src/wx-console/wxbrestorepanel.cpp:513
+#: src/wx-console/wxbrestorepanel.cpp:516
+#: src/wx-console/wxbrestorepanel.cpp:1784
+#: src/wx-console/wxbrestorepanel.cpp:1870
 msgid "Job Name"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:336
-#: src/wx-console/wxbrestorepanel.cpp:352
-#: src/wx-console/wxbrestorepanel.cpp:454
+#: src/wx-console/wxbrestorepanel.cpp:337
+#: src/wx-console/wxbrestorepanel.cpp:353
 #: src/wx-console/wxbrestorepanel.cpp:455
-#: src/wx-console/wxbrestorepanel.cpp:465
+#: src/wx-console/wxbrestorepanel.cpp:456
 #: src/wx-console/wxbrestorepanel.cpp:466
-#: src/wx-console/wxbrestorepanel.cpp:1138
-#: src/wx-console/wxbrestorepanel.cpp:1211
-#: src/wx-console/wxbrestorepanel.cpp:1821
-#: src/wx-console/wxbrestorepanel.cpp:1823
-#: src/wx-console/wxbrestorepanel.cpp:1884
+#: src/wx-console/wxbrestorepanel.cpp:467
+#: src/wx-console/wxbrestorepanel.cpp:1139
+#: src/wx-console/wxbrestorepanel.cpp:1212
+#: src/wx-console/wxbrestorepanel.cpp:1822
+#: src/wx-console/wxbrestorepanel.cpp:1824
+#: src/wx-console/wxbrestorepanel.cpp:1885
 msgid "Fileset"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:339
-#: src/wx-console/wxbrestorepanel.cpp:1205
-#: src/wx-console/wxbrestorepanel.cpp:1221
-#: src/wx-console/wxbrestorepanel.cpp:1223
-#: src/wx-console/wxbrestorepanel.cpp:1231
-#: src/wx-console/wxbrestorepanel.cpp:1233
-#: src/wx-console/wxbrestorepanel.cpp:1252
-#: src/wx-console/wxbrestorepanel.cpp:1259
-#: src/wx-console/wxbrestorepanel.cpp:1811
-#: src/wx-console/wxbrestorepanel.cpp:1822
-#: src/wx-console/wxbrestorepanel.cpp:1942
+#: src/wx-console/wxbrestorepanel.cpp:340
+#: src/wx-console/wxbrestorepanel.cpp:1206
+#: src/wx-console/wxbrestorepanel.cpp:1222
+#: src/wx-console/wxbrestorepanel.cpp:1224
+#: src/wx-console/wxbrestorepanel.cpp:1232
+#: src/wx-console/wxbrestorepanel.cpp:1234
+#: src/wx-console/wxbrestorepanel.cpp:1253
+#: src/wx-console/wxbrestorepanel.cpp:1260
+#: src/wx-console/wxbrestorepanel.cpp:1812
+#: src/wx-console/wxbrestorepanel.cpp:1823
+#: src/wx-console/wxbrestorepanel.cpp:1944
 msgid "Before"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:341
+#: src/wx-console/wxbrestorepanel.cpp:342
 msgid "Please configure parameters concerning files to restore :"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:350
-#: src/wx-console/wxbrestorepanel.cpp:1877
+#: src/wx-console/wxbrestorepanel.cpp:351
+#: src/wx-console/wxbrestorepanel.cpp:1878
 msgid "always"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:350
+#: src/wx-console/wxbrestorepanel.cpp:351
 msgid "if newer"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:350
+#: src/wx-console/wxbrestorepanel.cpp:351
 msgid "if older"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:350
-#: src/wx-console/wxbrestorepanel.cpp:1880
+#: src/wx-console/wxbrestorepanel.cpp:351
+#: src/wx-console/wxbrestorepanel.cpp:1881
 msgid "never"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:358
+#: src/wx-console/wxbrestorepanel.cpp:359
 msgid "Please configure parameters concerning files restoration :"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:426
+#: src/wx-console/wxbrestorepanel.cpp:427
 msgid "Getting parameters list."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:434
+#: src/wx-console/wxbrestorepanel.cpp:435
 msgid "Error : no clients returned by the director."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:458
+#: src/wx-console/wxbrestorepanel.cpp:459
 msgid "Error : no filesets returned by the director."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:482
+#: src/wx-console/wxbrestorepanel.cpp:483
 msgid "Error : no storage returned by the director."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:505
-#: src/wx-console/wxbrestorepanel.cpp:529
+#: src/wx-console/wxbrestorepanel.cpp:506
+#: src/wx-console/wxbrestorepanel.cpp:530
 msgid "Error : no jobs returned by the director."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:515
+#: src/wx-console/wxbrestorepanel.cpp:516
 msgid "RestoreFiles"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:550
+#: src/wx-console/wxbrestorepanel.cpp:551
 msgid "Please configure your restore parameters."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:561
+#: src/wx-console/wxbrestorepanel.cpp:562
 msgid "Building restore tree..."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:604
+#: src/wx-console/wxbrestorepanel.cpp:605
 msgid "Error while starting restore: "
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:694
+#: src/wx-console/wxbrestorepanel.cpp:695
 msgid ""
 "Right click on a file or on a directory, or double-click on its mark to add "
 "it to the restore list."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:731
-#: src/wx-console/wxbrestorepanel.cpp:753
-msgid "wx-console: unexpected restore question."
+#: src/wx-console/wxbrestorepanel.cpp:732
+#: src/wx-console/wxbrestorepanel.cpp:754
+msgid "bwx-console: unexpected restore question."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:764
+#: src/wx-console/wxbrestorepanel.cpp:765
 msgid " files selected to be restored."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:769
+#: src/wx-console/wxbrestorepanel.cpp:770
 msgid " file selected to be restored."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:776
+#: src/wx-console/wxbrestorepanel.cpp:777
 #, c-format
 msgid "Please configure your restore (%ld files selected to be restored)..."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:786
+#: src/wx-console/wxbrestorepanel.cpp:787
 msgid "Restore failed : no file selected.\n"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:787
+#: src/wx-console/wxbrestorepanel.cpp:788
 msgid "Restore failed : no file selected."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:797
+#: src/wx-console/wxbrestorepanel.cpp:798
 msgid "Restoring, please wait..."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:810
-msgid "Job started. JobId="
+#: src/wx-console/wxbrestorepanel.cpp:811
+msgid "Job queued. JobId="
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:812
-msgid "Restore started, jobid="
+#: src/wx-console/wxbrestorepanel.cpp:813
+msgid "Restore queued, jobid="
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:816
+#: src/wx-console/wxbrestorepanel.cpp:817
 msgid "Job failed."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:817
+#: src/wx-console/wxbrestorepanel.cpp:818
 msgid "Restore failed, please look at messages.\n"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:818
+#: src/wx-console/wxbrestorepanel.cpp:819
 msgid "Restore failed, please look at messages in console."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:824
 #: src/wx-console/wxbrestorepanel.cpp:825
+#: src/wx-console/wxbrestorepanel.cpp:826
 msgid "Failed to retrieve jobid.\n"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:851
+#: src/wx-console/wxbrestorepanel.cpp:852
 msgid ""
-"Restore is scheduled in more than two minutes, wx-console will not wait for "
+"Restore is scheduled in more than two minutes, bwx-console will not wait for "
 "its completion.\n"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:852
+#: src/wx-console/wxbrestorepanel.cpp:853
 msgid ""
-"Restore is scheduled in more than two minutes, wx-console will not wait for "
+"Restore is scheduled in more than two minutes, bwx-console will not wait for "
 "its completion."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:878
+#: src/wx-console/wxbrestorepanel.cpp:879
 msgid "Restore job created, but not yet running."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:883
+#: src/wx-console/wxbrestorepanel.cpp:884
 #, c-format
 msgid "Restore job running, please wait (%ld of %ld files restored)..."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:887
+#: src/wx-console/wxbrestorepanel.cpp:888
 msgid "Restore job terminated successfully."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:888
+#: src/wx-console/wxbrestorepanel.cpp:889
 msgid "Restore job terminated successfully.\n"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:893
+#: src/wx-console/wxbrestorepanel.cpp:894
 msgid "Restore job terminated in error, see messages in console."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:894
+#: src/wx-console/wxbrestorepanel.cpp:895
 msgid "Restore job terminated in error, see messages.\n"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:899
+#: src/wx-console/wxbrestorepanel.cpp:900
 msgid "Restore job reported a non-fatal error."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:903
+#: src/wx-console/wxbrestorepanel.cpp:904
 msgid "Restore job reported a fatal error."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:908
+#: src/wx-console/wxbrestorepanel.cpp:909
 msgid "Restore job cancelled by user."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:909
+#: src/wx-console/wxbrestorepanel.cpp:910
 msgid "Restore job cancelled by user.\n"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:914
+#: src/wx-console/wxbrestorepanel.cpp:915
 msgid "Restore job is waiting on File daemon."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:918
+#: src/wx-console/wxbrestorepanel.cpp:919
 msgid "Restore job is waiting for new media."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:922
+#: src/wx-console/wxbrestorepanel.cpp:923
 msgid "Restore job is waiting for storage resource."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:926
+#: src/wx-console/wxbrestorepanel.cpp:927
 msgid "Restore job is waiting for job resource."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:930
+#: src/wx-console/wxbrestorepanel.cpp:931
 msgid "Restore job is waiting for Client resource."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:934
+#: src/wx-console/wxbrestorepanel.cpp:935
 msgid "Restore job is waiting for maximum jobs."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:938
+#: src/wx-console/wxbrestorepanel.cpp:939
 msgid "Restore job is waiting for start time."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:942
+#: src/wx-console/wxbrestorepanel.cpp:943
 msgid "Restore job is waiting for higher priority jobs to finish."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:991
+#: src/wx-console/wxbrestorepanel.cpp:992
 msgid ""
-"The restore job has not been started within one minute, wx-console will not "
+"The restore job has not been started within one minute, bwx-console will not "
 "wait for its completion anymore.\n"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:992
+#: src/wx-console/wxbrestorepanel.cpp:993
 msgid ""
-"The restore job has not been started within one minute, wx-console will not "
+"The restore job has not been started within one minute, bwx-console will not "
 "wait for its completion anymore."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1002
+#: src/wx-console/wxbrestorepanel.cpp:1003
 msgid "Restore done successfully.\n"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1003
+#: src/wx-console/wxbrestorepanel.cpp:1004
 msgid "Restore done successfully."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1074
+#: src/wx-console/wxbrestorepanel.cpp:1075
 msgid "Applying restore configuration changes..."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1125
+#: src/wx-console/wxbrestorepanel.cpp:1126
 msgid "Failed to find the selected client."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1140
+#: src/wx-console/wxbrestorepanel.cpp:1141
 msgid "Failed to find the selected fileset."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1155
+#: src/wx-console/wxbrestorepanel.cpp:1156
 msgid "Failed to find the selected storage."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1172
-#: src/wx-console/wxbrestorepanel.cpp:1858
+#: src/wx-console/wxbrestorepanel.cpp:1173
+#: src/wx-console/wxbrestorepanel.cpp:1859
 msgid "Run Restore job"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1188
+#: src/wx-console/wxbrestorepanel.cpp:1189
 msgid "Restore configuration changes were applied."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1197
+#: src/wx-console/wxbrestorepanel.cpp:1198
 msgid "Restore cancelled.\n"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1198
+#: src/wx-console/wxbrestorepanel.cpp:1199
 msgid "Restore cancelled."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1220
+#: src/wx-console/wxbrestorepanel.cpp:1221
 msgid "No results to list."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1222
+#: src/wx-console/wxbrestorepanel.cpp:1223
 msgid "No backup found for this client."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1229
+#: src/wx-console/wxbrestorepanel.cpp:1230
 msgid "ERROR"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1230
+#: src/wx-console/wxbrestorepanel.cpp:1231
 msgid "Query failed"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1232
+#: src/wx-console/wxbrestorepanel.cpp:1233
 msgid "Cannot get previous backups list, see console."
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1868
+#: src/wx-console/wxbrestorepanel.cpp:1869
 msgid "JobName:"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1872
+#: src/wx-console/wxbrestorepanel.cpp:1873
 msgid "Where:"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1875
+#: src/wx-console/wxbrestorepanel.cpp:1876
 msgid "Replace:"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1878
+#: src/wx-console/wxbrestorepanel.cpp:1879
 msgid "ifnewer"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1879
+#: src/wx-console/wxbrestorepanel.cpp:1880
 msgid "ifolder"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1883
+#: src/wx-console/wxbrestorepanel.cpp:1884
 msgid "FileSet:"
 msgstr ""
 
-#: src/wx-console/wxbrestorepanel.cpp:1999
+#: src/wx-console/wxbrestorepanel.cpp:2001
 msgid "Restoring..."
 msgstr ""