Final changes

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.0@3987 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 74df294b64a4d25725f500636d477b1abe5307a4..04e8e885f4e979d8ade51f253c3cf687f4cdc2d1 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -3,6 +3,8 @@
 General:
 Version 2.0.1
 12Jan07
+kes  Fix Bacula->Documentation link on Win32 to point to index.html
+     instead of bacula.html. Fixed bug #750.
 kes  Return JobId in db_get_job_record() when JobId==0. This should
      fix bug #741.
 kes  Do not release source pointers when restarting a failed job.

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index fa4426769dde7dcecdede1432b2872e169ff15c6..52bc7d2797bbd81605bdf7dfb697ab29ab66a482 100644 (file)
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -7,6 +7,8 @@ This is a bug fix release to version 2.0.0:
 
 Version 2.0.1
 12Jan07
+kes  Fix Bacula->Documentation link on Win32 to point to index.html
+     instead of bacula.html. Fixed bug #750.
 kes  Return JobId in db_get_job_record() when JobId==0. This should
      fix bug #741.
 kes  Do not release source pointers when restarting a failed job.

diff --git a/bacula/po/bacula.pot b/bacula/po/bacula.pot
index 04be90ea4555f052bccae5922cce0bd8952ff4d1..d23bb4289918d26831a69dd33365f1b57ab6b77a 100644 (file)
--- a/bacula/po/bacula.pot
+++ b/bacula/po/bacula.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-01-04 09:52+0100\n"
+"POT-Creation-Date: 2007-01-12 17:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -134,8 +134,8 @@ msgid ""
 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_get.c:186 src/cats/sql_get.c:237 src/cats/sql_get.c:595
+#: src/cats/sql_get.c:670 src/cats/sql_get.c:901
 #, c-format
 msgid "error fetching row: %s\n"
 msgstr ""
@@ -416,104 +416,104 @@ msgstr ""
 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:355 src/cats/sql_get.c:411
 #, 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:361 src/cats/sql_get.c:424
 #, c-format
 msgid "Error fetching row %d: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:372
+#: src/cats/sql_get.c:375
 #, c-format
 msgid "No Volume for JobId %d found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:508
+#: src/cats/sql_get.c:511
 #, c-format
 msgid "Pool id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:545
+#: src/cats/sql_get.c:548
 #, c-format
 msgid "Client id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:587
+#: src/cats/sql_get.c:590
 #, c-format
 msgid "More than one Pool!: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:628
+#: src/cats/sql_get.c:631
 msgid "Pool record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:662
+#: src/cats/sql_get.c:665
 #, 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:682 src/cats/sql_get.c:686
 msgid "Client record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:708
+#: src/cats/sql_get.c:711
 #, c-format
 msgid "More than one Counter!: %d\n"
 msgstr ""
 
-#: src/cats/sql_get.c:713
+#: src/cats/sql_get.c:716
 #, c-format
 msgid "error fetching Counter row: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:733
+#: src/cats/sql_get.c:736
 #, c-format
 msgid "Counter record: %s not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:769
+#: src/cats/sql_get.c:772
 #, c-format
 msgid "Error got %s FileSets but expected only one!\n"
 msgstr ""
 
-#: src/cats/sql_get.c:774
+#: src/cats/sql_get.c:777
 #, c-format
 msgid "FileSet record \"%s\" not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:784
+#: src/cats/sql_get.c:787
 msgid "FileSet record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:841
+#: src/cats/sql_get.c:844
 #, c-format
 msgid "Media id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:893
+#: src/cats/sql_get.c:896
 #, c-format
 msgid "More than one Volume!: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:946
+#: src/cats/sql_get.c:949
 #, c-format
 msgid "Media record MediaId=%s not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:949
+#: src/cats/sql_get.c:952
 #, c-format
 msgid "Media record for Volume \"%s\" not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:956
+#: src/cats/sql_get.c:959
 #, 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:962
 #, c-format
 msgid "Media record for Vol=%s not found in Catalog.\n"
 msgstr ""
@@ -744,7 +744,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/backup.c:87 src/dird/job.c:937 src/dird/job.c:976
+#: src/dird/backup.c:87 src/dird/job.c:940 src/dird/job.c:986
 #: src/dird/migrate.c:229 src/dird/migrate.c:230
 msgid "Pool resource"
 msgstr ""
@@ -1649,7 +1649,7 @@ msgstr ""
 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:468 src/filed/job.c:1772
 #, c-format
 msgid "Could not open bootstrap file %s: ERR=%s\n"
 msgstr ""
@@ -1767,7 +1767,7 @@ msgstr ""
 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/job.c:145 src/dird/job.c:151 src/dird/job.c:966 src/dird/job.c:978
 #: src/dird/ua_cmds.c:690 src/dird/ua_cmds.c:1340 src/dird/ua_status.c:293
 msgid "unknown source"
 msgstr ""
@@ -1790,99 +1790,99 @@ msgstr ""
 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:394 src/dird/job.c:396 src/dird/job.c:943 src/dird/job.c:984
+#: src/dird/job.c:993
 msgid "Job resource"
 msgstr ""
 
-#: src/dird/job.c:411 src/dird/ua_cmds.c:696 src/dird/ua_cmds.c:1354
+#: src/dird/job.c:409 src/dird/ua_cmds.c:696 src/dird/ua_cmds.c:1354
 #: src/dird/ua_label.c:753
 msgid "Failed to connect to Storage daemon.\n"
 msgstr ""
 
-#: src/dird/job.c:456
+#: src/dird/job.c:454
 msgid "Max wait time exceeded. Job canceled.\n"
 msgstr ""
 
-#: src/dird/job.c:461
+#: src/dird/job.c:459
 msgid "Max run time exceeded. Job canceled.\n"
 msgstr ""
 
-#: src/dird/job.c:555 src/dird/job.c:604
+#: src/dird/job.c:553 src/dird/job.c:602
 #, 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:628 src/dird/ua_output.c:630
 #, 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:632 src/dird/ua_output.c:638
 #, c-format
 msgid "Pool %s created in database.\n"
 msgstr ""
 
-#: src/dird/job.c:643 src/dird/job.c:927
+#: src/dird/job.c:641 src/dird/job.c:930
 msgid "Run pool override"
 msgstr ""
 
-#: src/dird/job.c:653
+#: src/dird/job.c:651
 msgid "Run FullPool override"
 msgstr ""
 
-#: src/dird/job.c:655
+#: src/dird/job.c:653
 msgid "Job FullPool override"
 msgstr ""
 
-#: src/dird/job.c:663
+#: src/dird/job.c:661
 msgid "Run IncPool override"
 msgstr ""
 
-#: src/dird/job.c:665
+#: src/dird/job.c:663
 msgid "Job IncPool override"
 msgstr ""
 
-#: src/dird/job.c:673
+#: src/dird/job.c:671
 msgid "Run DiffPool override"
 msgstr ""
 
-#: src/dird/job.c:675
+#: src/dird/job.c:673
 msgid "Job DiffPool override"
 msgstr ""
 
-#: src/dird/job.c:700 src/stored/bscan.c:962
+#: src/dird/job.c:698 src/stored/bscan.c:962
 #, c-format
 msgid "Could not create Client record. ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:736
+#: src/dird/job.c:734
 msgid "FileSet MD5 digest not found.\n"
 msgstr ""
 
-#: src/dird/job.c:741
+#: src/dird/job.c:739
 #, c-format
 msgid "Could not create FileSet \"%s\" record. ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:781
+#: src/dird/job.c:779
 #, c-format
 msgid "Error updating job record. %s"
 msgstr ""
 
-#: src/dird/job.c:932
+#: src/dird/job.c:935
 msgid "Run storage override"
 msgstr ""
 
-#: src/dird/job.c:1045 src/dird/ua_run.c:389
+#: src/dird/job.c:1055 src/dird/ua_run.c:389
 msgid "No storage specified.\n"
 msgstr ""
 
-#: src/dird/job.c:1206
+#: src/dird/job.c:1216
 msgid "Could not start clone job.\n"
 msgstr ""
 
-#: src/dird/job.c:1208
+#: src/dird/job.c:1218
 #, c-format
 msgid "Clone JobId %d started.\n"
 msgstr ""
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "Storage from Pool's NextPool resource"
 msgstr ""
 
-#: src/dird/msgchan.c:99 src/filed/job.c:1247
+#: src/dird/msgchan.c:99 src/filed/job.c:1248
 #: src/tray-monitor/tray-monitor.c:888
 msgid "Storage daemon"
 msgstr ""
@@ -2790,7 +2790,7 @@ msgstr ""
 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:441 src/filed/status.c:197 src/stored/status.c:424
 msgid "No Jobs running.\n"
 msgstr ""
 
@@ -3619,7 +3619,7 @@ msgid "Enter a list of directories to restore for found JobIds"
 msgstr ""
 
 #: src/dird/ua_restore.c:329 src/dird/ua_status.c:732 src/filed/status.c:254
-#: src/stored/status.c:495 src/wx-console/wxbconfigpanel.cpp:212
+#: src/stored/status.c:498 src/wx-console/wxbconfigpanel.cpp:212
 msgid "Cancel"
 msgstr ""
 
@@ -4163,27 +4163,27 @@ msgid "Levels:\n"
 msgstr ""
 
 #: src/dird/ua_run.c:782 src/filed/status.c:371 src/lib/util.c:329
-#: src/stored/status.c:534
+#: src/stored/status.c:537
 msgid "Base"
 msgstr ""
 
 #: src/dird/ua_run.c:783 src/filed/status.c:373 src/lib/util.c:331
-#: src/stored/status.c:536
+#: src/stored/status.c:539
 msgid "Full"
 msgstr ""
 
 #: src/dird/ua_run.c:784 src/filed/status.c:376 src/lib/util.c:334
-#: src/stored/status.c:539
+#: src/stored/status.c:542
 msgid "Incremental"
 msgstr ""
 
 #: src/dird/ua_run.c:785 src/filed/status.c:379 src/lib/util.c:337
-#: src/stored/status.c:542
+#: src/stored/status.c:545
 msgid "Differential"
 msgstr ""
 
 #: src/dird/ua_run.c:786 src/filed/status.c:382 src/lib/util.c:340
-#: src/stored/status.c:545
+#: src/stored/status.c:548
 msgid "Since"
 msgstr ""
 
@@ -4196,7 +4196,7 @@ msgid "Initialize Catalog"
 msgstr ""
 
 #: src/dird/ua_run.c:809 src/filed/status.c:385 src/lib/util.c:343
-#: src/stored/status.c:548
+#: src/stored/status.c:551
 msgid "Verify Catalog"
 msgstr ""
 
@@ -4761,13 +4761,13 @@ msgstr ""
 msgid "No Terminated Jobs.\n"
 msgstr ""
 
-#: src/dird/ua_status.c:689 src/filed/status.c:214 src/stored/status.c:456
+#: src/dird/ua_status.c:689 src/filed/status.c:214 src/stored/status.c:459
 msgid ""
 "\n"
 "Terminated Jobs:\n"
 msgstr ""
 
-#: src/dird/ua_status.c:690 src/filed/status.c:222 src/stored/status.c:463
+#: src/dird/ua_status.c:690 src/filed/status.c:222 src/stored/status.c:466
 msgid " JobId  Level    Files      Bytes   Status   Finished        Name \n"
 msgstr ""
 
@@ -4776,30 +4776,30 @@ msgid "====================================================================\n"
 msgstr ""
 
 #: src/dird/ua_status.c:722 src/filed/status.c:244 src/lib/util.c:179
-#: src/stored/status.c:485
+#: src/stored/status.c:488
 msgid "Created"
 msgstr ""
 
 #: src/dird/ua_status.c:726 src/filed/status.c:248 src/lib/util.c:192
-#: src/lib/util.c:259 src/stored/status.c:489
+#: src/lib/util.c:259 src/stored/status.c:492
 msgid "Error"
 msgstr ""
 
-#: src/dird/ua_status.c:729 src/filed/status.c:251 src/stored/status.c:492
+#: src/dird/ua_status.c:729 src/filed/status.c:251 src/stored/status.c:495
 msgid "Diffs"
 msgstr ""
 
 #: src/dird/ua_status.c:735 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/lib/util.c:255 src/stored/btape.c:1187 src/stored/status.c:501
 #: src/wx-console/wxbconfigpanel.cpp:201
 msgid "OK"
 msgstr ""
 
-#: src/dird/ua_status.c:738 src/filed/status.c:260 src/stored/status.c:501
+#: src/dird/ua_status.c:738 src/filed/status.c:260 src/stored/status.c:504
 msgid "Other"
 msgstr ""
 
-#: src/dird/ua_status.c:741 src/filed/status.c:271 src/stored/status.c:512
+#: src/dird/ua_status.c:741 src/filed/status.c:271 src/stored/status.c:515
 #, c-format
 msgid "%6d  %-6s %8s %10s  %-7s  %-8s %s\n"
 msgstr ""
@@ -6149,151 +6149,151 @@ msgstr ""
 msgid "Cannot open FileSet input file: %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:731
+#: src/filed/job.c:733
 #, c-format
 msgid "REGEX %s compile error. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:793
+#: src/filed/job.c:795
 #, 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:1009 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:1078 src/stored/fd_cmds.c:348
 #, c-format
 msgid "Could not create bootstrap file %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1179
+#: src/filed/job.c:1180
 #, 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:1188
 #, c-format
 msgid "Unknown backup level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1199
+#: src/filed/job.c:1200
 #, c-format
 msgid "Bad level command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1220
+#: src/filed/job.c:1221
 #, c-format
 msgid "Bad session command: %s"
 msgstr ""
 
-#: src/filed/job.c:1241
+#: src/filed/job.c:1242
 #, c-format
 msgid "Bad storage command: %s"
 msgstr ""
 
-#: src/filed/job.c:1250
+#: src/filed/job.c:1251
 #, c-format
 msgid "Failed to connect to Storage daemon: %s:%d\n"
 msgstr ""
 
-#: src/filed/job.c:1262
+#: src/filed/job.c:1263
 msgid "Failed to authenticate Storage daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1300
+#: src/filed/job.c:1301
 msgid "Cannot contact Storage daemon\n"
 msgstr ""
 
-#: src/filed/job.c:1318
+#: src/filed/job.c:1319
 #, c-format
 msgid "Bad response to append open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1323
+#: src/filed/job.c:1324
 msgid "Bad response from stored to open command\n"
 msgstr ""
 
-#: src/filed/job.c:1350
+#: src/filed/job.c:1351
 #, c-format
 msgid "Generate VSS snapshots. Driver=\"%s\", Drive(s)=\"%s\"\n"
 msgstr ""
 
-#: src/filed/job.c:1352
+#: src/filed/job.c:1353
 msgid "Generate VSS snapshots failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1359
+#: src/filed/job.c:1360
 #, 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:1367
 #, c-format
 msgid "VSS Writer (PrepareForBackup): %s\n"
 msgstr ""
 
-#: src/filed/job.c:1371
+#: src/filed/job.c:1372
 msgid "No drive letters found for generating VSS snapshots.\n"
 msgstr ""
 
-#: src/filed/job.c:1375
+#: src/filed/job.c:1376
 #, 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:1434
 msgid "Append Close with SD failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1437
+#: src/filed/job.c:1438
 #, c-format
 msgid "Bad status %d returned from Storage Daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1455
+#: src/filed/job.c:1456
 #, c-format
 msgid "VSS Writer (BackupComplete): %s\n"
 msgstr ""
 
-#: src/filed/job.c:1483
+#: src/filed/job.c:1484
 #, c-format
 msgid "2994 Bad verify command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1498 src/filed/job.c:1537
+#: src/filed/job.c:1499 src/filed/job.c:1538
 #, c-format
 msgid "2994 Bad verify level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1579
+#: src/filed/job.c:1580
 #, c-format
 msgid "Bad replace command. CMD=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1658
+#: src/filed/job.c:1659
 msgid "Improper calling sequence.\n"
 msgstr ""
 
-#: src/filed/job.c:1678
+#: src/filed/job.c:1679
 #, c-format
 msgid "Bad response to SD read open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1683
+#: src/filed/job.c:1684
 msgid "Bad response from stored to read open command\n"
 msgstr ""
 
-#: src/filed/job.c:1747
+#: src/filed/job.c:1748
 #, c-format
 msgid "Comm error with SD. bad response to %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1750
+#: src/filed/job.c:1751
 #, c-format
 msgid "Bad response to %s command. Wanted %s, got %s\n"
 msgstr ""
@@ -6563,7 +6563,7 @@ msgstr ""
 msgid "    %s%s Job started: %s\n"
 msgstr ""
 
-#: src/filed/status.c:169 src/stored/status.c:398
+#: src/filed/status.c:169 src/stored/status.c:401
 #, c-format
 msgid "    Files=%s Bytes=%s Bytes/sec=%s\n"
 msgstr ""
@@ -6582,8 +6582,8 @@ msgstr ""
 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:326 src/filed/status.c:350 src/stored/status.c:613
+#: src/stored/status.c:636
 #, c-format
 msgid "Bad .status command: %s\n"
 msgstr ""
@@ -6596,23 +6596,23 @@ msgstr ""
 msgid "2900 Bad .status command, wrong argument.\n"
 msgstr ""
 
-#: src/filed/status.c:388 src/stored/status.c:551
+#: src/filed/status.c:388 src/stored/status.c:554
 msgid "Init Catalog"
 msgstr ""
 
-#: src/filed/status.c:391 src/stored/status.c:554
+#: src/filed/status.c:391 src/stored/status.c:557
 msgid "Volume to Catalog"
 msgstr ""
 
-#: src/filed/status.c:394 src/stored/status.c:557
+#: src/filed/status.c:394 src/stored/status.c:560
 msgid "Disk to Catalog"
 msgstr ""
 
-#: src/filed/status.c:397 src/stored/status.c:560
+#: src/filed/status.c:397 src/stored/status.c:563
 msgid "Data"
 msgstr ""
 
-#: src/filed/status.c:403 src/lib/util.c:361 src/stored/status.c:566
+#: src/filed/status.c:403 src/lib/util.c:361 src/stored/status.c:569
 msgid "Unknown Job Level"
 msgstr ""
 
@@ -13345,50 +13345,55 @@ msgid ""
 "    pool=\"%s\" device=\"%s\"\n"
 msgstr ""
 
-#: src/stored/status.c:406
+#: src/stored/status.c:392
+#, c-format
+msgid "    spooling=%d despooling=%d despool_wait=%d\n"
+msgstr ""
+
+#: src/stored/status.c:409
 #, c-format
 msgid "    FDReadSeqNo=%s in_msg=%u out_msg=%d fd=%d\n"
 msgstr ""
 
-#: src/stored/status.c:412
+#: src/stored/status.c:415
 msgid "    FDSocket closed\n"
 msgstr ""
 
-#: src/stored/status.c:434
+#: src/stored/status.c:437
 msgid ""
 "\n"
 "Jobs waiting to reserve a drive:\n"
 msgstr ""
 
-#: src/stored/status.c:465
+#: src/stored/status.c:468
 msgid "===================================================================\n"
 msgstr ""
 
-#: src/stored/status.c:611
+#: src/stored/status.c:614
 msgid "3900 Bad .status command, missing argument.\n"
 msgstr ""
 
-#: src/stored/status.c:634
+#: src/stored/status.c:637
 msgid "3900 Bad .status command, wrong argument.\n"
 msgstr ""
 
-#: src/stored/status.c:648
+#: src/stored/status.c:651
 msgid "Bacula Storage: Idle"
 msgstr ""
 
-#: src/stored/status.c:659
+#: src/stored/status.c:662
 msgid "Bacula Storage: Running"
 msgstr ""
 
-#: src/stored/status.c:673
+#: src/stored/status.c:676
 msgid "Bacula Storage: Last Job Canceled"
 msgstr ""
 
-#: src/stored/status.c:677
+#: src/stored/status.c:680
 msgid "Bacula Storage: Last Job Failed"
 msgstr ""
 
-#: src/stored/status.c:681
+#: src/stored/status.c:684
 msgid "Bacula Storage: Last Job had Warnings"
 msgstr ""
 

diff --git a/bacula/po/de.gmo b/bacula/po/de.gmo
index caaf3151f8ac41dc2f23bdf134c30dbed420fa1e..51f65794377287edb1366272c8233dad2514c800 100644 (file)
Binary files a/bacula/po/de.gmo and b/bacula/po/de.gmo differ

diff --git a/bacula/po/de.po b/bacula/po/de.po
index 48289bec2ee05627416acb0c6c0034daae2e59cd..c89fc2b80c167d181f7f755840a53de0668a82fd 100644 (file)
--- a/bacula/po/de.po
+++ b/bacula/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Bacula 1.38\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-01-04 09:52+0100\n"
+"POT-Creation-Date: 2007-01-12 17:30+0100\n"
 "PO-Revision-Date: 2005-08-11 14:05+0200\n"
 "Last-Translator:  <bacula-devel@lists.sourceforge.net\n"
 "Language-Team: German <bacula-devel@lists.sourceforge.net>\n"
@@ -135,8 +135,8 @@ msgid ""
 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_get.c:186 src/cats/sql_get.c:237 src/cats/sql_get.c:595
+#: src/cats/sql_get.c:670 src/cats/sql_get.c:901
 #, c-format
 msgid "error fetching row: %s\n"
 msgstr ""
@@ -417,104 +417,104 @@ msgstr ""
 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:355 src/cats/sql_get.c:411
 #, 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:361 src/cats/sql_get.c:424
 #, c-format
 msgid "Error fetching row %d: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:372
+#: src/cats/sql_get.c:375
 #, c-format
 msgid "No Volume for JobId %d found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:508
+#: src/cats/sql_get.c:511
 #, c-format
 msgid "Pool id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:545
+#: src/cats/sql_get.c:548
 #, c-format
 msgid "Client id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:587
+#: src/cats/sql_get.c:590
 #, c-format
 msgid "More than one Pool!: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:628
+#: src/cats/sql_get.c:631
 msgid "Pool record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:662
+#: src/cats/sql_get.c:665
 #, 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:682 src/cats/sql_get.c:686
 msgid "Client record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:708
+#: src/cats/sql_get.c:711
 #, c-format
 msgid "More than one Counter!: %d\n"
 msgstr ""
 
-#: src/cats/sql_get.c:713
+#: src/cats/sql_get.c:716
 #, c-format
 msgid "error fetching Counter row: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:733
+#: src/cats/sql_get.c:736
 #, c-format
 msgid "Counter record: %s not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:769
+#: src/cats/sql_get.c:772
 #, c-format
 msgid "Error got %s FileSets but expected only one!\n"
 msgstr ""
 
-#: src/cats/sql_get.c:774
+#: src/cats/sql_get.c:777
 #, c-format
 msgid "FileSet record \"%s\" not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:784
+#: src/cats/sql_get.c:787
 msgid "FileSet record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:841
+#: src/cats/sql_get.c:844
 #, c-format
 msgid "Media id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:893
+#: src/cats/sql_get.c:896
 #, c-format
 msgid "More than one Volume!: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:946
+#: src/cats/sql_get.c:949
 #, c-format
 msgid "Media record MediaId=%s not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:949
+#: src/cats/sql_get.c:952
 #, c-format
 msgid "Media record for Volume \"%s\" not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:956
+#: src/cats/sql_get.c:959
 #, 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:962
 #, c-format
 msgid "Media record for Vol=%s not found in Catalog.\n"
 msgstr ""
@@ -745,7 +745,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/backup.c:87 src/dird/job.c:937 src/dird/job.c:976
+#: src/dird/backup.c:87 src/dird/job.c:940 src/dird/job.c:986
 #: src/dird/migrate.c:229 src/dird/migrate.c:230
 msgid "Pool resource"
 msgstr ""
@@ -1650,7 +1650,7 @@ msgstr ""
 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:468 src/filed/job.c:1772
 #, c-format
 msgid "Could not open bootstrap file %s: ERR=%s\n"
 msgstr ""
@@ -1768,7 +1768,7 @@ msgstr ""
 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/job.c:145 src/dird/job.c:151 src/dird/job.c:966 src/dird/job.c:978
 #: src/dird/ua_cmds.c:690 src/dird/ua_cmds.c:1340 src/dird/ua_status.c:293
 msgid "unknown source"
 msgstr ""
@@ -1791,99 +1791,99 @@ msgstr ""
 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:394 src/dird/job.c:396 src/dird/job.c:943 src/dird/job.c:984
+#: src/dird/job.c:993
 msgid "Job resource"
 msgstr ""
 
-#: src/dird/job.c:411 src/dird/ua_cmds.c:696 src/dird/ua_cmds.c:1354
+#: src/dird/job.c:409 src/dird/ua_cmds.c:696 src/dird/ua_cmds.c:1354
 #: src/dird/ua_label.c:753
 msgid "Failed to connect to Storage daemon.\n"
 msgstr ""
 
-#: src/dird/job.c:456
+#: src/dird/job.c:454
 msgid "Max wait time exceeded. Job canceled.\n"
 msgstr ""
 
-#: src/dird/job.c:461
+#: src/dird/job.c:459
 msgid "Max run time exceeded. Job canceled.\n"
 msgstr ""
 
-#: src/dird/job.c:555 src/dird/job.c:604
+#: src/dird/job.c:553 src/dird/job.c:602
 #, 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:628 src/dird/ua_output.c:630
 #, 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:632 src/dird/ua_output.c:638
 #, c-format
 msgid "Pool %s created in database.\n"
 msgstr ""
 
-#: src/dird/job.c:643 src/dird/job.c:927
+#: src/dird/job.c:641 src/dird/job.c:930
 msgid "Run pool override"
 msgstr ""
 
-#: src/dird/job.c:653
+#: src/dird/job.c:651
 msgid "Run FullPool override"
 msgstr ""
 
-#: src/dird/job.c:655
+#: src/dird/job.c:653
 msgid "Job FullPool override"
 msgstr ""
 
-#: src/dird/job.c:663
+#: src/dird/job.c:661
 msgid "Run IncPool override"
 msgstr ""
 
-#: src/dird/job.c:665
+#: src/dird/job.c:663
 msgid "Job IncPool override"
 msgstr ""
 
-#: src/dird/job.c:673
+#: src/dird/job.c:671
 msgid "Run DiffPool override"
 msgstr ""
 
-#: src/dird/job.c:675
+#: src/dird/job.c:673
 msgid "Job DiffPool override"
 msgstr ""
 
-#: src/dird/job.c:700 src/stored/bscan.c:962
+#: src/dird/job.c:698 src/stored/bscan.c:962
 #, c-format
 msgid "Could not create Client record. ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:736
+#: src/dird/job.c:734
 msgid "FileSet MD5 digest not found.\n"
 msgstr ""
 
-#: src/dird/job.c:741
+#: src/dird/job.c:739
 #, c-format
 msgid "Could not create FileSet \"%s\" record. ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:781
+#: src/dird/job.c:779
 #, c-format
 msgid "Error updating job record. %s"
 msgstr ""
 
-#: src/dird/job.c:932
+#: src/dird/job.c:935
 msgid "Run storage override"
 msgstr ""
 
-#: src/dird/job.c:1045 src/dird/ua_run.c:389
+#: src/dird/job.c:1055 src/dird/ua_run.c:389
 msgid "No storage specified.\n"
 msgstr ""
 
-#: src/dird/job.c:1206
+#: src/dird/job.c:1216
 msgid "Could not start clone job.\n"
 msgstr ""
 
-#: src/dird/job.c:1208
+#: src/dird/job.c:1218
 #, c-format
 msgid "Clone JobId %d started.\n"
 msgstr ""
@@ -2180,7 +2180,7 @@ msgstr ""
 msgid "Storage from Pool's NextPool resource"
 msgstr ""
 
-#: src/dird/msgchan.c:99 src/filed/job.c:1247
+#: src/dird/msgchan.c:99 src/filed/job.c:1248
 #: src/tray-monitor/tray-monitor.c:888
 msgid "Storage daemon"
 msgstr ""
@@ -2791,7 +2791,7 @@ msgstr ""
 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:441 src/filed/status.c:197 src/stored/status.c:424
 msgid "No Jobs running.\n"
 msgstr ""
 
@@ -3620,7 +3620,7 @@ msgid "Enter a list of directories to restore for found JobIds"
 msgstr ""
 
 #: src/dird/ua_restore.c:329 src/dird/ua_status.c:732 src/filed/status.c:254
-#: src/stored/status.c:495 src/wx-console/wxbconfigpanel.cpp:212
+#: src/stored/status.c:498 src/wx-console/wxbconfigpanel.cpp:212
 msgid "Cancel"
 msgstr ""
 
@@ -4164,27 +4164,27 @@ msgid "Levels:\n"
 msgstr ""
 
 #: src/dird/ua_run.c:782 src/filed/status.c:371 src/lib/util.c:329
-#: src/stored/status.c:534
+#: src/stored/status.c:537
 msgid "Base"
 msgstr ""
 
 #: src/dird/ua_run.c:783 src/filed/status.c:373 src/lib/util.c:331
-#: src/stored/status.c:536
+#: src/stored/status.c:539
 msgid "Full"
 msgstr ""
 
 #: src/dird/ua_run.c:784 src/filed/status.c:376 src/lib/util.c:334
-#: src/stored/status.c:539
+#: src/stored/status.c:542
 msgid "Incremental"
 msgstr ""
 
 #: src/dird/ua_run.c:785 src/filed/status.c:379 src/lib/util.c:337
-#: src/stored/status.c:542
+#: src/stored/status.c:545
 msgid "Differential"
 msgstr ""
 
 #: src/dird/ua_run.c:786 src/filed/status.c:382 src/lib/util.c:340
-#: src/stored/status.c:545
+#: src/stored/status.c:548
 msgid "Since"
 msgstr ""
 
@@ -4197,7 +4197,7 @@ msgid "Initialize Catalog"
 msgstr ""
 
 #: src/dird/ua_run.c:809 src/filed/status.c:385 src/lib/util.c:343
-#: src/stored/status.c:548
+#: src/stored/status.c:551
 msgid "Verify Catalog"
 msgstr ""
 
@@ -4762,13 +4762,13 @@ msgstr ""
 msgid "No Terminated Jobs.\n"
 msgstr ""
 
-#: src/dird/ua_status.c:689 src/filed/status.c:214 src/stored/status.c:456
+#: src/dird/ua_status.c:689 src/filed/status.c:214 src/stored/status.c:459
 msgid ""
 "\n"
 "Terminated Jobs:\n"
 msgstr ""
 
-#: src/dird/ua_status.c:690 src/filed/status.c:222 src/stored/status.c:463
+#: src/dird/ua_status.c:690 src/filed/status.c:222 src/stored/status.c:466
 msgid " JobId  Level    Files      Bytes   Status   Finished        Name \n"
 msgstr ""
 
@@ -4777,30 +4777,30 @@ msgid "====================================================================\n"
 msgstr ""
 
 #: src/dird/ua_status.c:722 src/filed/status.c:244 src/lib/util.c:179
-#: src/stored/status.c:485
+#: src/stored/status.c:488
 msgid "Created"
 msgstr ""
 
 #: src/dird/ua_status.c:726 src/filed/status.c:248 src/lib/util.c:192
-#: src/lib/util.c:259 src/stored/status.c:489
+#: src/lib/util.c:259 src/stored/status.c:492
 msgid "Error"
 msgstr ""
 
-#: src/dird/ua_status.c:729 src/filed/status.c:251 src/stored/status.c:492
+#: src/dird/ua_status.c:729 src/filed/status.c:251 src/stored/status.c:495
 msgid "Diffs"
 msgstr ""
 
 #: src/dird/ua_status.c:735 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/lib/util.c:255 src/stored/btape.c:1187 src/stored/status.c:501
 #: src/wx-console/wxbconfigpanel.cpp:201
 msgid "OK"
 msgstr ""
 
-#: src/dird/ua_status.c:738 src/filed/status.c:260 src/stored/status.c:501
+#: src/dird/ua_status.c:738 src/filed/status.c:260 src/stored/status.c:504
 msgid "Other"
 msgstr ""
 
-#: src/dird/ua_status.c:741 src/filed/status.c:271 src/stored/status.c:512
+#: src/dird/ua_status.c:741 src/filed/status.c:271 src/stored/status.c:515
 #, c-format
 msgid "%6d  %-6s %8s %10s  %-7s  %-8s %s\n"
 msgstr ""
@@ -6150,151 +6150,151 @@ msgstr ""
 msgid "Cannot open FileSet input file: %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:731
+#: src/filed/job.c:733
 #, c-format
 msgid "REGEX %s compile error. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:793
+#: src/filed/job.c:795
 #, 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:1009 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:1078 src/stored/fd_cmds.c:348
 #, c-format
 msgid "Could not create bootstrap file %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1179
+#: src/filed/job.c:1180
 #, 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:1188
 #, c-format
 msgid "Unknown backup level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1199
+#: src/filed/job.c:1200
 #, c-format
 msgid "Bad level command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1220
+#: src/filed/job.c:1221
 #, c-format
 msgid "Bad session command: %s"
 msgstr ""
 
-#: src/filed/job.c:1241
+#: src/filed/job.c:1242
 #, c-format
 msgid "Bad storage command: %s"
 msgstr ""
 
-#: src/filed/job.c:1250
+#: src/filed/job.c:1251
 #, c-format
 msgid "Failed to connect to Storage daemon: %s:%d\n"
 msgstr ""
 
-#: src/filed/job.c:1262
+#: src/filed/job.c:1263
 msgid "Failed to authenticate Storage daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1300
+#: src/filed/job.c:1301
 msgid "Cannot contact Storage daemon\n"
 msgstr ""
 
-#: src/filed/job.c:1318
+#: src/filed/job.c:1319
 #, c-format
 msgid "Bad response to append open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1323
+#: src/filed/job.c:1324
 msgid "Bad response from stored to open command\n"
 msgstr ""
 
-#: src/filed/job.c:1350
+#: src/filed/job.c:1351
 #, c-format
 msgid "Generate VSS snapshots. Driver=\"%s\", Drive(s)=\"%s\"\n"
 msgstr ""
 
-#: src/filed/job.c:1352
+#: src/filed/job.c:1353
 msgid "Generate VSS snapshots failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1359
+#: src/filed/job.c:1360
 #, 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:1367
 #, c-format
 msgid "VSS Writer (PrepareForBackup): %s\n"
 msgstr ""
 
-#: src/filed/job.c:1371
+#: src/filed/job.c:1372
 msgid "No drive letters found for generating VSS snapshots.\n"
 msgstr ""
 
-#: src/filed/job.c:1375
+#: src/filed/job.c:1376
 #, 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:1434
 msgid "Append Close with SD failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1437
+#: src/filed/job.c:1438
 #, c-format
 msgid "Bad status %d returned from Storage Daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1455
+#: src/filed/job.c:1456
 #, c-format
 msgid "VSS Writer (BackupComplete): %s\n"
 msgstr ""
 
-#: src/filed/job.c:1483
+#: src/filed/job.c:1484
 #, c-format
 msgid "2994 Bad verify command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1498 src/filed/job.c:1537
+#: src/filed/job.c:1499 src/filed/job.c:1538
 #, c-format
 msgid "2994 Bad verify level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1579
+#: src/filed/job.c:1580
 #, c-format
 msgid "Bad replace command. CMD=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1658
+#: src/filed/job.c:1659
 msgid "Improper calling sequence.\n"
 msgstr ""
 
-#: src/filed/job.c:1678
+#: src/filed/job.c:1679
 #, c-format
 msgid "Bad response to SD read open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1683
+#: src/filed/job.c:1684
 msgid "Bad response from stored to read open command\n"
 msgstr ""
 
-#: src/filed/job.c:1747
+#: src/filed/job.c:1748
 #, c-format
 msgid "Comm error with SD. bad response to %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1750
+#: src/filed/job.c:1751
 #, c-format
 msgid "Bad response to %s command. Wanted %s, got %s\n"
 msgstr ""
@@ -6564,7 +6564,7 @@ msgstr ""
 msgid "    %s%s Job started: %s\n"
 msgstr ""
 
-#: src/filed/status.c:169 src/stored/status.c:398
+#: src/filed/status.c:169 src/stored/status.c:401
 #, c-format
 msgid "    Files=%s Bytes=%s Bytes/sec=%s\n"
 msgstr ""
@@ -6583,8 +6583,8 @@ msgstr ""
 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:326 src/filed/status.c:350 src/stored/status.c:613
+#: src/stored/status.c:636
 #, c-format
 msgid "Bad .status command: %s\n"
 msgstr ""
@@ -6597,23 +6597,23 @@ msgstr ""
 msgid "2900 Bad .status command, wrong argument.\n"
 msgstr ""
 
-#: src/filed/status.c:388 src/stored/status.c:551
+#: src/filed/status.c:388 src/stored/status.c:554
 msgid "Init Catalog"
 msgstr ""
 
-#: src/filed/status.c:391 src/stored/status.c:554
+#: src/filed/status.c:391 src/stored/status.c:557
 msgid "Volume to Catalog"
 msgstr ""
 
-#: src/filed/status.c:394 src/stored/status.c:557
+#: src/filed/status.c:394 src/stored/status.c:560
 msgid "Disk to Catalog"
 msgstr ""
 
-#: src/filed/status.c:397 src/stored/status.c:560
+#: src/filed/status.c:397 src/stored/status.c:563
 msgid "Data"
 msgstr ""
 
-#: src/filed/status.c:403 src/lib/util.c:361 src/stored/status.c:566
+#: src/filed/status.c:403 src/lib/util.c:361 src/stored/status.c:569
 msgid "Unknown Job Level"
 msgstr ""
 
@@ -13346,50 +13346,55 @@ msgid ""
 "    pool=\"%s\" device=\"%s\"\n"
 msgstr ""
 
-#: src/stored/status.c:406
+#: src/stored/status.c:392
+#, c-format
+msgid "    spooling=%d despooling=%d despool_wait=%d\n"
+msgstr ""
+
+#: src/stored/status.c:409
 #, c-format
 msgid "    FDReadSeqNo=%s in_msg=%u out_msg=%d fd=%d\n"
 msgstr ""
 
-#: src/stored/status.c:412
+#: src/stored/status.c:415
 msgid "    FDSocket closed\n"
 msgstr ""
 
-#: src/stored/status.c:434
+#: src/stored/status.c:437
 msgid ""
 "\n"
 "Jobs waiting to reserve a drive:\n"
 msgstr ""
 
-#: src/stored/status.c:465
+#: src/stored/status.c:468
 msgid "===================================================================\n"
 msgstr ""
 
-#: src/stored/status.c:611
+#: src/stored/status.c:614
 msgid "3900 Bad .status command, missing argument.\n"
 msgstr ""
 
-#: src/stored/status.c:634
+#: src/stored/status.c:637
 msgid "3900 Bad .status command, wrong argument.\n"
 msgstr ""
 
-#: src/stored/status.c:648
+#: src/stored/status.c:651
 msgid "Bacula Storage: Idle"
 msgstr ""
 
-#: src/stored/status.c:659
+#: src/stored/status.c:662
 msgid "Bacula Storage: Running"
 msgstr ""
 
-#: src/stored/status.c:673
+#: src/stored/status.c:676
 msgid "Bacula Storage: Last Job Canceled"
 msgstr ""
 
-#: src/stored/status.c:677
+#: src/stored/status.c:680
 msgid "Bacula Storage: Last Job Failed"
 msgstr ""
 
-#: src/stored/status.c:681
+#: src/stored/status.c:684
 msgid "Bacula Storage: Last Job had Warnings"
 msgstr ""
 

diff --git a/bacula/po/es.gmo b/bacula/po/es.gmo
index 2b1251b96451e019419b1f533df89354ef10aa73..315e7eb2c8ddf71e6c1a371b48f85665ab29c746 100644 (file)
Binary files a/bacula/po/es.gmo and b/bacula/po/es.gmo differ

diff --git a/bacula/po/es.po b/bacula/po/es.po
index 13424e48afd6ab4d35067f6993cdba8699e41f35..bb67507b6da7204949e3b929c0e241a78fda003b 100644 (file)
--- a/bacula/po/es.po
+++ b/bacula/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: branch 1.38\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-01-04 09:52+0100\n"
+"POT-Creation-Date: 2007-01-12 17:30+0100\n"
 "PO-Revision-Date: 2006-04-13 08:14+0200\n"
 "Last-Translator:  <kern@sibbald.com>\n"
 "Language-Team: Spanish\n"
@@ -135,8 +135,8 @@ msgid ""
 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_get.c:186 src/cats/sql_get.c:237 src/cats/sql_get.c:595
+#: src/cats/sql_get.c:670 src/cats/sql_get.c:901
 #, c-format
 msgid "error fetching row: %s\n"
 msgstr ""
@@ -417,104 +417,104 @@ msgstr ""
 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:355 src/cats/sql_get.c:411
 #, 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:361 src/cats/sql_get.c:424
 #, c-format
 msgid "Error fetching row %d: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:372
+#: src/cats/sql_get.c:375
 #, c-format
 msgid "No Volume for JobId %d found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:508
+#: src/cats/sql_get.c:511
 #, c-format
 msgid "Pool id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:545
+#: src/cats/sql_get.c:548
 #, c-format
 msgid "Client id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:587
+#: src/cats/sql_get.c:590
 #, c-format
 msgid "More than one Pool!: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:628
+#: src/cats/sql_get.c:631
 msgid "Pool record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:662
+#: src/cats/sql_get.c:665
 #, 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:682 src/cats/sql_get.c:686
 msgid "Client record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:708
+#: src/cats/sql_get.c:711
 #, c-format
 msgid "More than one Counter!: %d\n"
 msgstr ""
 
-#: src/cats/sql_get.c:713
+#: src/cats/sql_get.c:716
 #, c-format
 msgid "error fetching Counter row: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:733
+#: src/cats/sql_get.c:736
 #, c-format
 msgid "Counter record: %s not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:769
+#: src/cats/sql_get.c:772
 #, c-format
 msgid "Error got %s FileSets but expected only one!\n"
 msgstr ""
 
-#: src/cats/sql_get.c:774
+#: src/cats/sql_get.c:777
 #, c-format
 msgid "FileSet record \"%s\" not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:784
+#: src/cats/sql_get.c:787
 msgid "FileSet record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:841
+#: src/cats/sql_get.c:844
 #, c-format
 msgid "Media id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:893
+#: src/cats/sql_get.c:896
 #, c-format
 msgid "More than one Volume!: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:946
+#: src/cats/sql_get.c:949
 #, c-format
 msgid "Media record MediaId=%s not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:949
+#: src/cats/sql_get.c:952
 #, c-format
 msgid "Media record for Volume \"%s\" not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:956
+#: src/cats/sql_get.c:959
 #, 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:962
 #, c-format
 msgid "Media record for Vol=%s not found in Catalog.\n"
 msgstr ""
@@ -745,7 +745,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/backup.c:87 src/dird/job.c:937 src/dird/job.c:976
+#: src/dird/backup.c:87 src/dird/job.c:940 src/dird/job.c:986
 #: src/dird/migrate.c:229 src/dird/migrate.c:230
 msgid "Pool resource"
 msgstr ""
@@ -1650,7 +1650,7 @@ msgstr ""
 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:468 src/filed/job.c:1772
 #, c-format
 msgid "Could not open bootstrap file %s: ERR=%s\n"
 msgstr ""
@@ -1768,7 +1768,7 @@ msgstr ""
 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/job.c:145 src/dird/job.c:151 src/dird/job.c:966 src/dird/job.c:978
 #: src/dird/ua_cmds.c:690 src/dird/ua_cmds.c:1340 src/dird/ua_status.c:293
 msgid "unknown source"
 msgstr ""
@@ -1791,99 +1791,99 @@ msgstr ""
 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:394 src/dird/job.c:396 src/dird/job.c:943 src/dird/job.c:984
+#: src/dird/job.c:993
 msgid "Job resource"
 msgstr ""
 
-#: src/dird/job.c:411 src/dird/ua_cmds.c:696 src/dird/ua_cmds.c:1354
+#: src/dird/job.c:409 src/dird/ua_cmds.c:696 src/dird/ua_cmds.c:1354
 #: src/dird/ua_label.c:753
 msgid "Failed to connect to Storage daemon.\n"
 msgstr ""
 
-#: src/dird/job.c:456
+#: src/dird/job.c:454
 msgid "Max wait time exceeded. Job canceled.\n"
 msgstr ""
 
-#: src/dird/job.c:461
+#: src/dird/job.c:459
 msgid "Max run time exceeded. Job canceled.\n"
 msgstr ""
 
-#: src/dird/job.c:555 src/dird/job.c:604
+#: src/dird/job.c:553 src/dird/job.c:602
 #, 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:628 src/dird/ua_output.c:630
 #, 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:632 src/dird/ua_output.c:638
 #, c-format
 msgid "Pool %s created in database.\n"
 msgstr ""
 
-#: src/dird/job.c:643 src/dird/job.c:927
+#: src/dird/job.c:641 src/dird/job.c:930
 msgid "Run pool override"
 msgstr ""
 
-#: src/dird/job.c:653
+#: src/dird/job.c:651
 msgid "Run FullPool override"
 msgstr ""
 
-#: src/dird/job.c:655
+#: src/dird/job.c:653
 msgid "Job FullPool override"
 msgstr ""
 
-#: src/dird/job.c:663
+#: src/dird/job.c:661
 msgid "Run IncPool override"
 msgstr ""
 
-#: src/dird/job.c:665
+#: src/dird/job.c:663
 msgid "Job IncPool override"
 msgstr ""
 
-#: src/dird/job.c:673
+#: src/dird/job.c:671
 msgid "Run DiffPool override"
 msgstr ""
 
-#: src/dird/job.c:675
+#: src/dird/job.c:673
 msgid "Job DiffPool override"
 msgstr ""
 
-#: src/dird/job.c:700 src/stored/bscan.c:962
+#: src/dird/job.c:698 src/stored/bscan.c:962
 #, c-format
 msgid "Could not create Client record. ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:736
+#: src/dird/job.c:734
 msgid "FileSet MD5 digest not found.\n"
 msgstr ""
 
-#: src/dird/job.c:741
+#: src/dird/job.c:739
 #, c-format
 msgid "Could not create FileSet \"%s\" record. ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:781
+#: src/dird/job.c:779
 #, c-format
 msgid "Error updating job record. %s"
 msgstr ""
 
-#: src/dird/job.c:932
+#: src/dird/job.c:935
 msgid "Run storage override"
 msgstr ""
 
-#: src/dird/job.c:1045 src/dird/ua_run.c:389
+#: src/dird/job.c:1055 src/dird/ua_run.c:389
 msgid "No storage specified.\n"
 msgstr ""
 
-#: src/dird/job.c:1206
+#: src/dird/job.c:1216
 msgid "Could not start clone job.\n"
 msgstr ""
 
-#: src/dird/job.c:1208
+#: src/dird/job.c:1218
 #, c-format
 msgid "Clone JobId %d started.\n"
 msgstr ""
@@ -2180,7 +2180,7 @@ msgstr ""
 msgid "Storage from Pool's NextPool resource"
 msgstr ""
 
-#: src/dird/msgchan.c:99 src/filed/job.c:1247
+#: src/dird/msgchan.c:99 src/filed/job.c:1248
 #: src/tray-monitor/tray-monitor.c:888
 msgid "Storage daemon"
 msgstr ""
@@ -2791,7 +2791,7 @@ msgstr ""
 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:441 src/filed/status.c:197 src/stored/status.c:424
 msgid "No Jobs running.\n"
 msgstr ""
 
@@ -3620,7 +3620,7 @@ msgid "Enter a list of directories to restore for found JobIds"
 msgstr ""
 
 #: src/dird/ua_restore.c:329 src/dird/ua_status.c:732 src/filed/status.c:254
-#: src/stored/status.c:495 src/wx-console/wxbconfigpanel.cpp:212
+#: src/stored/status.c:498 src/wx-console/wxbconfigpanel.cpp:212
 msgid "Cancel"
 msgstr ""
 
@@ -4164,27 +4164,27 @@ msgid "Levels:\n"
 msgstr ""
 
 #: src/dird/ua_run.c:782 src/filed/status.c:371 src/lib/util.c:329
-#: src/stored/status.c:534
+#: src/stored/status.c:537
 msgid "Base"
 msgstr ""
 
 #: src/dird/ua_run.c:783 src/filed/status.c:373 src/lib/util.c:331
-#: src/stored/status.c:536
+#: src/stored/status.c:539
 msgid "Full"
 msgstr ""
 
 #: src/dird/ua_run.c:784 src/filed/status.c:376 src/lib/util.c:334
-#: src/stored/status.c:539
+#: src/stored/status.c:542
 msgid "Incremental"
 msgstr ""
 
 #: src/dird/ua_run.c:785 src/filed/status.c:379 src/lib/util.c:337
-#: src/stored/status.c:542
+#: src/stored/status.c:545
 msgid "Differential"
 msgstr ""
 
 #: src/dird/ua_run.c:786 src/filed/status.c:382 src/lib/util.c:340
-#: src/stored/status.c:545
+#: src/stored/status.c:548
 msgid "Since"
 msgstr ""
 
@@ -4197,7 +4197,7 @@ msgid "Initialize Catalog"
 msgstr ""
 
 #: src/dird/ua_run.c:809 src/filed/status.c:385 src/lib/util.c:343
-#: src/stored/status.c:548
+#: src/stored/status.c:551
 msgid "Verify Catalog"
 msgstr ""
 
@@ -4762,13 +4762,13 @@ msgstr ""
 msgid "No Terminated Jobs.\n"
 msgstr ""
 
-#: src/dird/ua_status.c:689 src/filed/status.c:214 src/stored/status.c:456
+#: src/dird/ua_status.c:689 src/filed/status.c:214 src/stored/status.c:459
 msgid ""
 "\n"
 "Terminated Jobs:\n"
 msgstr ""
 
-#: src/dird/ua_status.c:690 src/filed/status.c:222 src/stored/status.c:463
+#: src/dird/ua_status.c:690 src/filed/status.c:222 src/stored/status.c:466
 msgid " JobId  Level    Files      Bytes   Status   Finished        Name \n"
 msgstr ""
 
@@ -4777,30 +4777,30 @@ msgid "====================================================================\n"
 msgstr ""
 
 #: src/dird/ua_status.c:722 src/filed/status.c:244 src/lib/util.c:179
-#: src/stored/status.c:485
+#: src/stored/status.c:488
 msgid "Created"
 msgstr ""
 
 #: src/dird/ua_status.c:726 src/filed/status.c:248 src/lib/util.c:192
-#: src/lib/util.c:259 src/stored/status.c:489
+#: src/lib/util.c:259 src/stored/status.c:492
 msgid "Error"
 msgstr ""
 
-#: src/dird/ua_status.c:729 src/filed/status.c:251 src/stored/status.c:492
+#: src/dird/ua_status.c:729 src/filed/status.c:251 src/stored/status.c:495
 msgid "Diffs"
 msgstr ""
 
 #: src/dird/ua_status.c:735 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/lib/util.c:255 src/stored/btape.c:1187 src/stored/status.c:501
 #: src/wx-console/wxbconfigpanel.cpp:201
 msgid "OK"
 msgstr ""
 
-#: src/dird/ua_status.c:738 src/filed/status.c:260 src/stored/status.c:501
+#: src/dird/ua_status.c:738 src/filed/status.c:260 src/stored/status.c:504
 msgid "Other"
 msgstr ""
 
-#: src/dird/ua_status.c:741 src/filed/status.c:271 src/stored/status.c:512
+#: src/dird/ua_status.c:741 src/filed/status.c:271 src/stored/status.c:515
 #, c-format
 msgid "%6d  %-6s %8s %10s  %-7s  %-8s %s\n"
 msgstr ""
@@ -6150,151 +6150,151 @@ msgstr ""
 msgid "Cannot open FileSet input file: %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:731
+#: src/filed/job.c:733
 #, c-format
 msgid "REGEX %s compile error. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:793
+#: src/filed/job.c:795
 #, 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:1009 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:1078 src/stored/fd_cmds.c:348
 #, c-format
 msgid "Could not create bootstrap file %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1179
+#: src/filed/job.c:1180
 #, 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:1188
 #, c-format
 msgid "Unknown backup level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1199
+#: src/filed/job.c:1200
 #, c-format
 msgid "Bad level command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1220
+#: src/filed/job.c:1221
 #, c-format
 msgid "Bad session command: %s"
 msgstr ""
 
-#: src/filed/job.c:1241
+#: src/filed/job.c:1242
 #, c-format
 msgid "Bad storage command: %s"
 msgstr ""
 
-#: src/filed/job.c:1250
+#: src/filed/job.c:1251
 #, c-format
 msgid "Failed to connect to Storage daemon: %s:%d\n"
 msgstr ""
 
-#: src/filed/job.c:1262
+#: src/filed/job.c:1263
 msgid "Failed to authenticate Storage daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1300
+#: src/filed/job.c:1301
 msgid "Cannot contact Storage daemon\n"
 msgstr ""
 
-#: src/filed/job.c:1318
+#: src/filed/job.c:1319
 #, c-format
 msgid "Bad response to append open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1323
+#: src/filed/job.c:1324
 msgid "Bad response from stored to open command\n"
 msgstr ""
 
-#: src/filed/job.c:1350
+#: src/filed/job.c:1351
 #, c-format
 msgid "Generate VSS snapshots. Driver=\"%s\", Drive(s)=\"%s\"\n"
 msgstr ""
 
-#: src/filed/job.c:1352
+#: src/filed/job.c:1353
 msgid "Generate VSS snapshots failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1359
+#: src/filed/job.c:1360
 #, 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:1367
 #, c-format
 msgid "VSS Writer (PrepareForBackup): %s\n"
 msgstr ""
 
-#: src/filed/job.c:1371
+#: src/filed/job.c:1372
 msgid "No drive letters found for generating VSS snapshots.\n"
 msgstr ""
 
-#: src/filed/job.c:1375
+#: src/filed/job.c:1376
 #, 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:1434
 msgid "Append Close with SD failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1437
+#: src/filed/job.c:1438
 #, c-format
 msgid "Bad status %d returned from Storage Daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1455
+#: src/filed/job.c:1456
 #, c-format
 msgid "VSS Writer (BackupComplete): %s\n"
 msgstr ""
 
-#: src/filed/job.c:1483
+#: src/filed/job.c:1484
 #, c-format
 msgid "2994 Bad verify command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1498 src/filed/job.c:1537
+#: src/filed/job.c:1499 src/filed/job.c:1538
 #, c-format
 msgid "2994 Bad verify level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1579
+#: src/filed/job.c:1580
 #, c-format
 msgid "Bad replace command. CMD=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1658
+#: src/filed/job.c:1659
 msgid "Improper calling sequence.\n"
 msgstr ""
 
-#: src/filed/job.c:1678
+#: src/filed/job.c:1679
 #, c-format
 msgid "Bad response to SD read open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1683
+#: src/filed/job.c:1684
 msgid "Bad response from stored to read open command\n"
 msgstr ""
 
-#: src/filed/job.c:1747
+#: src/filed/job.c:1748
 #, c-format
 msgid "Comm error with SD. bad response to %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1750
+#: src/filed/job.c:1751
 #, c-format
 msgid "Bad response to %s command. Wanted %s, got %s\n"
 msgstr ""
@@ -6564,7 +6564,7 @@ msgstr ""
 msgid "    %s%s Job started: %s\n"
 msgstr ""
 
-#: src/filed/status.c:169 src/stored/status.c:398
+#: src/filed/status.c:169 src/stored/status.c:401
 #, c-format
 msgid "    Files=%s Bytes=%s Bytes/sec=%s\n"
 msgstr ""
@@ -6583,8 +6583,8 @@ msgstr ""
 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:326 src/filed/status.c:350 src/stored/status.c:613
+#: src/stored/status.c:636
 #, c-format
 msgid "Bad .status command: %s\n"
 msgstr ""
@@ -6597,23 +6597,23 @@ msgstr ""
 msgid "2900 Bad .status command, wrong argument.\n"
 msgstr ""
 
-#: src/filed/status.c:388 src/stored/status.c:551
+#: src/filed/status.c:388 src/stored/status.c:554
 msgid "Init Catalog"
 msgstr ""
 
-#: src/filed/status.c:391 src/stored/status.c:554
+#: src/filed/status.c:391 src/stored/status.c:557
 msgid "Volume to Catalog"
 msgstr ""
 
-#: src/filed/status.c:394 src/stored/status.c:557
+#: src/filed/status.c:394 src/stored/status.c:560
 msgid "Disk to Catalog"
 msgstr ""
 
-#: src/filed/status.c:397 src/stored/status.c:560
+#: src/filed/status.c:397 src/stored/status.c:563
 msgid "Data"
 msgstr ""
 
-#: src/filed/status.c:403 src/lib/util.c:361 src/stored/status.c:566
+#: src/filed/status.c:403 src/lib/util.c:361 src/stored/status.c:569
 msgid "Unknown Job Level"
 msgstr ""
 
@@ -13346,50 +13346,55 @@ msgid ""
 "    pool=\"%s\" device=\"%s\"\n"
 msgstr ""
 
-#: src/stored/status.c:406
+#: src/stored/status.c:392
+#, c-format
+msgid "    spooling=%d despooling=%d despool_wait=%d\n"
+msgstr ""
+
+#: src/stored/status.c:409
 #, c-format
 msgid "    FDReadSeqNo=%s in_msg=%u out_msg=%d fd=%d\n"
 msgstr ""
 
-#: src/stored/status.c:412
+#: src/stored/status.c:415
 msgid "    FDSocket closed\n"
 msgstr ""
 
-#: src/stored/status.c:434
+#: src/stored/status.c:437
 msgid ""
 "\n"
 "Jobs waiting to reserve a drive:\n"
 msgstr ""
 
-#: src/stored/status.c:465
+#: src/stored/status.c:468
 msgid "===================================================================\n"
 msgstr ""
 
-#: src/stored/status.c:611
+#: src/stored/status.c:614
 msgid "3900 Bad .status command, missing argument.\n"
 msgstr ""
 
-#: src/stored/status.c:634
+#: src/stored/status.c:637
 msgid "3900 Bad .status command, wrong argument.\n"
 msgstr ""
 
-#: src/stored/status.c:648
+#: src/stored/status.c:651
 msgid "Bacula Storage: Idle"
 msgstr ""
 
-#: src/stored/status.c:659
+#: src/stored/status.c:662
 msgid "Bacula Storage: Running"
 msgstr ""
 
-#: src/stored/status.c:673
+#: src/stored/status.c:676
 msgid "Bacula Storage: Last Job Canceled"
 msgstr ""
 
-#: src/stored/status.c:677
+#: src/stored/status.c:680
 msgid "Bacula Storage: Last Job Failed"
 msgstr ""
 
-#: src/stored/status.c:681
+#: src/stored/status.c:684
 msgid "Bacula Storage: Last Job had Warnings"
 msgstr ""
 

diff --git a/bacula/po/fr.gmo b/bacula/po/fr.gmo
index da2fd4583a10408c69514335eb543afdcfc030b8..ceec2d5ca6b27c88ee7a6f68b7a84632c6d36385 100644 (file)
Binary files a/bacula/po/fr.gmo and b/bacula/po/fr.gmo differ

diff --git a/bacula/po/fr.po b/bacula/po/fr.po
index 27913171858f3faec2e703be0218ac9c57d119ad..5b2b79a6edc1baf32e52a212f9e80de8aa132654 100644 (file)
--- a/bacula/po/fr.po
+++ b/bacula/po/fr.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: 2007-01-04 09:52+0100\n"
+"POT-Creation-Date: 2007-01-12 17:30+0100\n"
 "PO-Revision-Date: 2007-01-01 20:45+0100\n"
 "Last-Translator: Eric Bollengier <eric@eb.homelinux.org>\n"
 "Language-Team: French <bacula-devel-fr@lists.sourceforge.net>\n"
@@ -140,8 +140,8 @@ msgid ""
 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_get.c:186 src/cats/sql_get.c:237 src/cats/sql_get.c:595
+#: src/cats/sql_get.c:670 src/cats/sql_get.c:901
 #, c-format
 msgid "error fetching row: %s\n"
 msgstr ""
@@ -422,104 +422,104 @@ msgstr ""
 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:355 src/cats/sql_get.c:411
 #, 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:361 src/cats/sql_get.c:424
 #, c-format
 msgid "Error fetching row %d: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:372
+#: src/cats/sql_get.c:375
 #, c-format
 msgid "No Volume for JobId %d found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:508
+#: src/cats/sql_get.c:511
 #, c-format
 msgid "Pool id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:545
+#: src/cats/sql_get.c:548
 #, c-format
 msgid "Client id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:587
+#: src/cats/sql_get.c:590
 #, c-format
 msgid "More than one Pool!: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:628
+#: src/cats/sql_get.c:631
 msgid "Pool record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:662
+#: src/cats/sql_get.c:665
 #, 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:682 src/cats/sql_get.c:686
 msgid "Client record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:708
+#: src/cats/sql_get.c:711
 #, c-format
 msgid "More than one Counter!: %d\n"
 msgstr ""
 
-#: src/cats/sql_get.c:713
+#: src/cats/sql_get.c:716
 #, c-format
 msgid "error fetching Counter row: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:733
+#: src/cats/sql_get.c:736
 #, c-format
 msgid "Counter record: %s not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:769
+#: src/cats/sql_get.c:772
 #, c-format
 msgid "Error got %s FileSets but expected only one!\n"
 msgstr ""
 
-#: src/cats/sql_get.c:774
+#: src/cats/sql_get.c:777
 #, c-format
 msgid "FileSet record \"%s\" not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:784
+#: src/cats/sql_get.c:787
 msgid "FileSet record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:841
+#: src/cats/sql_get.c:844
 #, c-format
 msgid "Media id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:893
+#: src/cats/sql_get.c:896
 #, c-format
 msgid "More than one Volume!: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:946
+#: src/cats/sql_get.c:949
 #, c-format
 msgid "Media record MediaId=%s not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:949
+#: src/cats/sql_get.c:952
 #, c-format
 msgid "Media record for Volume \"%s\" not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:956
+#: src/cats/sql_get.c:959
 #, 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:962
 #, c-format
 msgid "Media record for Vol=%s not found in Catalog.\n"
 msgstr ""
@@ -767,7 +767,7 @@ msgstr ""
 "Fin de la purge automatique.\n"
 "\n"
 
-#: src/dird/backup.c:87 src/dird/job.c:937 src/dird/job.c:976
+#: src/dird/backup.c:87 src/dird/job.c:940 src/dird/job.c:986
 #: src/dird/migrate.c:229 src/dird/migrate.c:230
 #, fuzzy
 msgid "Pool resource"
@@ -1727,7 +1727,7 @@ msgstr "Erreur dans l'ex
 msgid "Cannot open included file: %s. ERR=%s\n"
 msgstr "Impossible d'ouvrir le fichier inclus : %s. ERR=%s\n"
 
-#: src/dird/fd_cmds.c:468 src/filed/job.c:1771
+#: src/dird/fd_cmds.c:468 src/filed/job.c:1772
 #, c-format
 msgid "Could not open bootstrap file %s: ERR=%s\n"
 msgstr "Impossible d'ouvrir le fichier bootstrap %s : ERR=%s\n"
@@ -1845,7 +1845,7 @@ msgstr ""
 msgid "Could not open database \"%s\".\n"
 msgstr "Impossible d'ouvrir la base de données « %s ».\n"
 
-#: src/dird/job.c:145 src/dird/job.c:151 src/dird/job.c:969
+#: src/dird/job.c:145 src/dird/job.c:151 src/dird/job.c:966 src/dird/job.c:978
 #: src/dird/ua_cmds.c:690 src/dird/ua_cmds.c:1340 src/dird/ua_status.c:293
 msgid "unknown source"
 msgstr "source inconnue"
@@ -1868,100 +1868,100 @@ msgstr "JobId %s, Job %s marqu
 msgid "Failed to connect to File daemon.\n"
 msgstr "Impossible de se connecter au client.\n"
 
-#: 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:394 src/dird/job.c:396 src/dird/job.c:943 src/dird/job.c:984
+#: src/dird/job.c:993
 #, fuzzy
 msgid "Job resource"
 msgstr "Pool à partir de sa définition"
 
-#: src/dird/job.c:411 src/dird/ua_cmds.c:696 src/dird/ua_cmds.c:1354
+#: src/dird/job.c:409 src/dird/ua_cmds.c:696 src/dird/ua_cmds.c:1354
 #: src/dird/ua_label.c:753
 msgid "Failed to connect to Storage daemon.\n"
 msgstr "Impossible de se connecter au Storage daemon.\n"
 
-#: src/dird/job.c:456
+#: src/dird/job.c:454
 msgid "Max wait time exceeded. Job canceled.\n"
 msgstr "Temps d'attente maximum dépassé. Abandon du job.\n"
 
-#: src/dird/job.c:461
+#: src/dird/job.c:459
 msgid "Max run time exceeded. Job canceled.\n"
 msgstr "Temps d'exécution maximum atteind. Abandon du job.\n"
 
-#: src/dird/job.c:555 src/dird/job.c:604
+#: src/dird/job.c:553 src/dird/job.c:602
 #, 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:628 src/dird/ua_output.c:630
 #, c-format
 msgid "Pool %s not in database. %s"
 msgstr "Pool %s introuvable en base. %s"
 
-#: src/dird/job.c:634 src/dird/ua_output.c:638
+#: src/dird/job.c:632 src/dird/ua_output.c:638
 #, c-format
 msgid "Pool %s created in database.\n"
 msgstr "Pool %s créé en base.\n"
 
-#: src/dird/job.c:643 src/dird/job.c:927
+#: src/dird/job.c:641 src/dird/job.c:930
 msgid "Run pool override"
 msgstr ""
 
-#: src/dird/job.c:653
+#: src/dird/job.c:651
 msgid "Run FullPool override"
 msgstr ""
 
-#: src/dird/job.c:655
+#: src/dird/job.c:653
 msgid "Job FullPool override"
 msgstr ""
 
-#: src/dird/job.c:663
+#: src/dird/job.c:661
 msgid "Run IncPool override"
 msgstr ""
 
-#: src/dird/job.c:665
+#: src/dird/job.c:663
 msgid "Job IncPool override"
 msgstr ""
 
-#: src/dird/job.c:673
+#: src/dird/job.c:671
 msgid "Run DiffPool override"
 msgstr ""
 
-#: src/dird/job.c:675
+#: src/dird/job.c:673
 msgid "Job DiffPool override"
 msgstr ""
 
-#: src/dird/job.c:700 src/stored/bscan.c:962
+#: src/dird/job.c:698 src/stored/bscan.c:962
 #, c-format
 msgid "Could not create Client record. ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:736
+#: src/dird/job.c:734
 msgid "FileSet MD5 digest not found.\n"
 msgstr ""
 
-#: src/dird/job.c:741
+#: src/dird/job.c:739
 #, c-format
 msgid "Could not create FileSet \"%s\" record. ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:781
+#: src/dird/job.c:779
 #, c-format
 msgid "Error updating job record. %s"
 msgstr ""
 
-#: src/dird/job.c:932
+#: src/dird/job.c:935
 msgid "Run storage override"
 msgstr ""
 
-#: src/dird/job.c:1045 src/dird/ua_run.c:389
+#: src/dird/job.c:1055 src/dird/ua_run.c:389
 msgid "No storage specified.\n"
 msgstr "Pas de storage sélectionné.\n"
 
-#: src/dird/job.c:1206
+#: src/dird/job.c:1216
 msgid "Could not start clone job.\n"
 msgstr ""
 
-#: src/dird/job.c:1208
+#: src/dird/job.c:1218
 #, c-format
 msgid "Clone JobId %d started.\n"
 msgstr ""
@@ -2295,7 +2295,7 @@ msgstr ""
 msgid "Storage from Pool's NextPool resource"
 msgstr "Sélectionnez le Pool"
 
-#: src/dird/msgchan.c:99 src/filed/job.c:1247
+#: src/dird/msgchan.c:99 src/filed/job.c:1248
 #: src/tray-monitor/tray-monitor.c:888
 msgid "Storage daemon"
 msgstr ""
@@ -2928,7 +2928,7 @@ msgstr ""
 msgid "Warning Job %s is not running. Continuing anyway ...\n"
 msgstr "Attention le Job %s n'est pas en cours. Continuons quand même...\n"
 
-#: src/dird/ua_cmds.c:441 src/filed/status.c:197 src/stored/status.c:421
+#: src/dird/ua_cmds.c:441 src/filed/status.c:197 src/stored/status.c:424
 msgid "No Jobs running.\n"
 msgstr "Pas de job en cours.\n"
 
@@ -3806,7 +3806,7 @@ msgid "Enter a list of directories to restore for found JobIds"
 msgstr "Saisir la liste des répertoires à restaurer (pour un JobId)"
 
 #: src/dird/ua_restore.c:329 src/dird/ua_status.c:732 src/filed/status.c:254
-#: src/stored/status.c:495 src/wx-console/wxbconfigpanel.cpp:212
+#: src/stored/status.c:498 src/wx-console/wxbconfigpanel.cpp:212
 msgid "Cancel"
 msgstr "Annulé"
 
@@ -4385,27 +4385,27 @@ msgid "Levels:\n"
 msgstr "Types :\n"
 
 #: src/dird/ua_run.c:782 src/filed/status.c:371 src/lib/util.c:329
-#: src/stored/status.c:534
+#: src/stored/status.c:537
 msgid "Base"
 msgstr "Base"
 
 #: src/dird/ua_run.c:783 src/filed/status.c:373 src/lib/util.c:331
-#: src/stored/status.c:536
+#: src/stored/status.c:539
 msgid "Full"
 msgstr "Full"
 
 #: src/dird/ua_run.c:784 src/filed/status.c:376 src/lib/util.c:334
-#: src/stored/status.c:539
+#: src/stored/status.c:542
 msgid "Incremental"
 msgstr "Incrémental"
 
 #: src/dird/ua_run.c:785 src/filed/status.c:379 src/lib/util.c:337
-#: src/stored/status.c:542
+#: src/stored/status.c:545
 msgid "Differential"
 msgstr "Différentiel"
 
 #: src/dird/ua_run.c:786 src/filed/status.c:382 src/lib/util.c:340
-#: src/stored/status.c:545
+#: src/stored/status.c:548
 msgid "Since"
 msgstr "Depuis"
 
@@ -4418,7 +4418,7 @@ msgid "Initialize Catalog"
 msgstr "Initialisez le catalogue"
 
 #: src/dird/ua_run.c:809 src/filed/status.c:385 src/lib/util.c:343
-#: src/stored/status.c:548
+#: src/stored/status.c:551
 msgid "Verify Catalog"
 msgstr ""
 
@@ -5058,7 +5058,7 @@ msgstr "%6d %-6s  %-20s %s\n"
 msgid "No Terminated Jobs.\n"
 msgstr "Pas de job terminé.\n"
 
-#: src/dird/ua_status.c:689 src/filed/status.c:214 src/stored/status.c:456
+#: src/dird/ua_status.c:689 src/filed/status.c:214 src/stored/status.c:459
 msgid ""
 "\n"
 "Terminated Jobs:\n"
@@ -5066,7 +5066,7 @@ msgstr ""
 "\n"
 "Job terminés :\n"
 
-#: src/dird/ua_status.c:690 src/filed/status.c:222 src/stored/status.c:463
+#: src/dird/ua_status.c:690 src/filed/status.c:222 src/stored/status.c:466
 msgid " JobId  Level    Files      Bytes   Status   Finished        Name \n"
 msgstr " JobId  Type     Fichiers   Octets   Statut  Terminé         Nom\n"
 
@@ -5075,30 +5075,30 @@ msgid "====================================================================\n"
 msgstr "=====================================================================\n"
 
 #: src/dird/ua_status.c:722 src/filed/status.c:244 src/lib/util.c:179
-#: src/stored/status.c:485
+#: src/stored/status.c:488
 msgid "Created"
 msgstr "Crée"
 
 #: src/dird/ua_status.c:726 src/filed/status.c:248 src/lib/util.c:192
-#: src/lib/util.c:259 src/stored/status.c:489
+#: src/lib/util.c:259 src/stored/status.c:492
 msgid "Error"
 msgstr "Erreur"
 
-#: src/dird/ua_status.c:729 src/filed/status.c:251 src/stored/status.c:492
+#: src/dird/ua_status.c:729 src/filed/status.c:251 src/stored/status.c:495
 msgid "Diffs"
 msgstr ""
 
 #: src/dird/ua_status.c:735 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/lib/util.c:255 src/stored/btape.c:1187 src/stored/status.c:501
 #: src/wx-console/wxbconfigpanel.cpp:201
 msgid "OK"
 msgstr "OK"
 
-#: src/dird/ua_status.c:738 src/filed/status.c:260 src/stored/status.c:501
+#: src/dird/ua_status.c:738 src/filed/status.c:260 src/stored/status.c:504
 msgid "Other"
 msgstr "Autre"
 
-#: src/dird/ua_status.c:741 src/filed/status.c:271 src/stored/status.c:512
+#: src/dird/ua_status.c:741 src/filed/status.c:271 src/stored/status.c:515
 #, c-format
 msgid "%6d  %-6s %8s %10s  %-7s  %-8s %s\n"
 msgstr "%6d  %-6s %8s %10s %-7s  %-8s %s\n"
@@ -6497,85 +6497,85 @@ msgstr "Erreur dans l'ex
 msgid "Cannot open FileSet input file: %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:731
+#: src/filed/job.c:733
 #, c-format
 msgid "REGEX %s compile error. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:793
+#: src/filed/job.c:795
 #, 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:1009 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:1078 src/stored/fd_cmds.c:348
 #, c-format
 msgid "Could not create bootstrap file %s: ERR=%s\n"
 msgstr "Impossible de créer le fichier bootstrap %s : ERR=%s\n"
 
-#: src/filed/job.c:1179
+#: src/filed/job.c:1180
 #, c-format
 msgid "DIR and FD clocks differ by %d seconds, FD automatically adjusting.\n"
 msgstr ""
 "L'horloge du client et du director ont %d secondes d'écart, le client s'est "
 "ajusté automatiquement.\n"
 
-#: src/filed/job.c:1187
+#: src/filed/job.c:1188
 #, c-format
 msgid "Unknown backup level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1199
+#: src/filed/job.c:1200
 #, c-format
 msgid "Bad level command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1220
+#: src/filed/job.c:1221
 #, c-format
 msgid "Bad session command: %s"
 msgstr ""
 
-#: src/filed/job.c:1241
+#: src/filed/job.c:1242
 #, c-format
 msgid "Bad storage command: %s"
 msgstr ""
 
-#: src/filed/job.c:1250
+#: src/filed/job.c:1251
 #, c-format
 msgid "Failed to connect to Storage daemon: %s:%d\n"
 msgstr ""
 
-#: src/filed/job.c:1262
+#: src/filed/job.c:1263
 msgid "Failed to authenticate Storage daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1300
+#: src/filed/job.c:1301
 msgid "Cannot contact Storage daemon\n"
 msgstr "Impossible de se connecter au démon Storage\n"
 
-#: src/filed/job.c:1318
+#: src/filed/job.c:1319
 #, c-format
 msgid "Bad response to append open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1323
+#: src/filed/job.c:1324
 msgid "Bad response from stored to open command\n"
 msgstr ""
 
-#: src/filed/job.c:1350
+#: src/filed/job.c:1351
 #, c-format
 msgid "Generate VSS snapshots. Driver=\"%s\", Drive(s)=\"%s\"\n"
 msgstr "Création des snapshot VSS. Driver=« %s », Lecteur(s)=« %s »\n"
 
-#: src/filed/job.c:1352
+#: src/filed/job.c:1353
 msgid "Generate VSS snapshots failed.\n"
 msgstr "Erreur durant la création des snapshots VSS.\n"
 
-#: src/filed/job.c:1359
+#: src/filed/job.c:1360
 #, c-format
 msgid ""
 "Generate VSS snapshot of drive \"%c:\\\" failed. VSS support is disabled on "
@@ -6584,68 +6584,68 @@ msgstr ""
 "Erreur lors de la création du snapshot VSS du lecteur « %c:\\\\ ». Le VSS "
 "est désactivé sur ce lecteur.\n"
 
-#: src/filed/job.c:1366
+#: src/filed/job.c:1367
 #, c-format
 msgid "VSS Writer (PrepareForBackup): %s\n"
 msgstr ""
 
-#: src/filed/job.c:1371
+#: src/filed/job.c:1372
 msgid "No drive letters found for generating VSS snapshots.\n"
 msgstr ""
 
-#: src/filed/job.c:1375
+#: src/filed/job.c:1376
 #, 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:1434
 msgid "Append Close with SD failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1437
+#: src/filed/job.c:1438
 #, c-format
 msgid "Bad status %d returned from Storage Daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1455
+#: src/filed/job.c:1456
 #, c-format
 msgid "VSS Writer (BackupComplete): %s\n"
 msgstr ""
 
-#: src/filed/job.c:1483
+#: src/filed/job.c:1484
 #, c-format
 msgid "2994 Bad verify command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1498 src/filed/job.c:1537
+#: src/filed/job.c:1499 src/filed/job.c:1538
 #, c-format
 msgid "2994 Bad verify level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1579
+#: src/filed/job.c:1580
 #, c-format
 msgid "Bad replace command. CMD=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1658
+#: src/filed/job.c:1659
 msgid "Improper calling sequence.\n"
 msgstr ""
 
-#: src/filed/job.c:1678
+#: src/filed/job.c:1679
 #, c-format
 msgid "Bad response to SD read open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1683
+#: src/filed/job.c:1684
 msgid "Bad response from stored to read open command\n"
 msgstr ""
 
-#: src/filed/job.c:1747
+#: src/filed/job.c:1748
 #, c-format
 msgid "Comm error with SD. bad response to %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1750
+#: src/filed/job.c:1751
 #, c-format
 msgid "Bad response to %s command. Wanted %s, got %s\n"
 msgstr ""
@@ -6916,7 +6916,7 @@ msgstr ""
 msgid "    %s%s Job started: %s\n"
 msgstr ""
 
-#: src/filed/status.c:169 src/stored/status.c:398
+#: src/filed/status.c:169 src/stored/status.c:401
 #, c-format
 msgid "    Files=%s Bytes=%s Bytes/sec=%s\n"
 msgstr ""
@@ -6935,8 +6935,8 @@ msgstr ""
 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:326 src/filed/status.c:350 src/stored/status.c:613
+#: src/stored/status.c:636
 #, c-format
 msgid "Bad .status command: %s\n"
 msgstr ""
@@ -6949,23 +6949,23 @@ msgstr ""
 msgid "2900 Bad .status command, wrong argument.\n"
 msgstr ""
 
-#: src/filed/status.c:388 src/stored/status.c:551
+#: src/filed/status.c:388 src/stored/status.c:554
 msgid "Init Catalog"
 msgstr ""
 
-#: src/filed/status.c:391 src/stored/status.c:554
+#: src/filed/status.c:391 src/stored/status.c:557
 msgid "Volume to Catalog"
 msgstr ""
 
-#: src/filed/status.c:394 src/stored/status.c:557
+#: src/filed/status.c:394 src/stored/status.c:560
 msgid "Disk to Catalog"
 msgstr ""
 
-#: src/filed/status.c:397 src/stored/status.c:560
+#: src/filed/status.c:397 src/stored/status.c:563
 msgid "Data"
 msgstr ""
 
-#: src/filed/status.c:403 src/lib/util.c:361 src/stored/status.c:566
+#: src/filed/status.c:403 src/lib/util.c:361 src/stored/status.c:569
 msgid "Unknown Job Level"
 msgstr ""
 
@@ -13906,16 +13906,21 @@ msgstr ""
 "Ecriture : %s %s job %s JobId=%d Volume=« %s »\n"
 "   pool=« %s » device=« %s »\n"
 
-#: src/stored/status.c:406
+#: src/stored/status.c:392
+#, c-format
+msgid "    spooling=%d despooling=%d despool_wait=%d\n"
+msgstr ""
+
+#: src/stored/status.c:409
 #, c-format
 msgid "    FDReadSeqNo=%s in_msg=%u out_msg=%d fd=%d\n"
 msgstr ""
 
-#: src/stored/status.c:412
+#: src/stored/status.c:415
 msgid "    FDSocket closed\n"
 msgstr ""
 
-#: src/stored/status.c:434
+#: src/stored/status.c:437
 msgid ""
 "\n"
 "Jobs waiting to reserve a drive:\n"
@@ -13923,35 +13928,35 @@ msgstr ""
 "\n"
 "Jobs en attente de réservation de lecteur :\n"
 
-#: src/stored/status.c:465
+#: src/stored/status.c:468
 msgid "===================================================================\n"
 msgstr "===================================================================\n"
 
-#: src/stored/status.c:611
+#: src/stored/status.c:614
 msgid "3900 Bad .status command, missing argument.\n"
 msgstr ""
 
-#: src/stored/status.c:634
+#: src/stored/status.c:637
 msgid "3900 Bad .status command, wrong argument.\n"
 msgstr ""
 
-#: src/stored/status.c:648
+#: src/stored/status.c:651
 msgid "Bacula Storage: Idle"
 msgstr "Bacula Storage : En attente"
 
-#: src/stored/status.c:659
+#: src/stored/status.c:662
 msgid "Bacula Storage: Running"
 msgstr "Bacula Storage : En cours"
 
-#: src/stored/status.c:673
+#: src/stored/status.c:676
 msgid "Bacula Storage: Last Job Canceled"
 msgstr "Bacula Storage : Dernier Job annulé"
 
-#: src/stored/status.c:677
+#: src/stored/status.c:680
 msgid "Bacula Storage: Last Job Failed"
 msgstr "Bacula Storage : Dernier Job en erreur"
 
-#: src/stored/status.c:681
+#: src/stored/status.c:684
 msgid "Bacula Storage: Last Job had Warnings"
 msgstr "Bacula Storage : Le dernier Job avait des erreurs"
 

diff --git a/bacula/po/it.gmo b/bacula/po/it.gmo
index c7dc0b7163dd42b856943564e4418d2f1ceea9c9..26a83acd4ad43df9d5a286b0817fb5603d6a9d21 100644 (file)
Binary files a/bacula/po/it.gmo and b/bacula/po/it.gmo differ

diff --git a/bacula/po/it.po b/bacula/po/it.po
index 5e1657bf33e631b849ffd357bd17c8569085a8e9..b9965d858065d0d2ac439051d1d51c7907576fdb 100644 (file)
--- 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: 2007-01-04 09:52+0100\n"
+"POT-Creation-Date: 2007-01-12 17:30+0100\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"
@@ -134,8 +134,8 @@ msgid ""
 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_get.c:186 src/cats/sql_get.c:237 src/cats/sql_get.c:595
+#: src/cats/sql_get.c:670 src/cats/sql_get.c:901
 #, c-format
 msgid "error fetching row: %s\n"
 msgstr ""
@@ -416,104 +416,104 @@ msgstr ""
 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:355 src/cats/sql_get.c:411
 #, 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:361 src/cats/sql_get.c:424
 #, c-format
 msgid "Error fetching row %d: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:372
+#: src/cats/sql_get.c:375
 #, c-format
 msgid "No Volume for JobId %d found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:508
+#: src/cats/sql_get.c:511
 #, c-format
 msgid "Pool id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:545
+#: src/cats/sql_get.c:548
 #, c-format
 msgid "Client id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:587
+#: src/cats/sql_get.c:590
 #, c-format
 msgid "More than one Pool!: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:628
+#: src/cats/sql_get.c:631
 msgid "Pool record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:662
+#: src/cats/sql_get.c:665
 #, 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:682 src/cats/sql_get.c:686
 msgid "Client record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:708
+#: src/cats/sql_get.c:711
 #, c-format
 msgid "More than one Counter!: %d\n"
 msgstr ""
 
-#: src/cats/sql_get.c:713
+#: src/cats/sql_get.c:716
 #, c-format
 msgid "error fetching Counter row: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:733
+#: src/cats/sql_get.c:736
 #, c-format
 msgid "Counter record: %s not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:769
+#: src/cats/sql_get.c:772
 #, c-format
 msgid "Error got %s FileSets but expected only one!\n"
 msgstr ""
 
-#: src/cats/sql_get.c:774
+#: src/cats/sql_get.c:777
 #, c-format
 msgid "FileSet record \"%s\" not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:784
+#: src/cats/sql_get.c:787
 msgid "FileSet record not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:841
+#: src/cats/sql_get.c:844
 #, c-format
 msgid "Media id select failed: ERR=%s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:893
+#: src/cats/sql_get.c:896
 #, c-format
 msgid "More than one Volume!: %s\n"
 msgstr ""
 
-#: src/cats/sql_get.c:946
+#: src/cats/sql_get.c:949
 #, c-format
 msgid "Media record MediaId=%s not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:949
+#: src/cats/sql_get.c:952
 #, c-format
 msgid "Media record for Volume \"%s\" not found.\n"
 msgstr ""
 
-#: src/cats/sql_get.c:956
+#: src/cats/sql_get.c:959
 #, 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:962
 #, c-format
 msgid "Media record for Vol=%s not found in Catalog.\n"
 msgstr ""
@@ -744,7 +744,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/backup.c:87 src/dird/job.c:937 src/dird/job.c:976
+#: src/dird/backup.c:87 src/dird/job.c:940 src/dird/job.c:986
 #: src/dird/migrate.c:229 src/dird/migrate.c:230
 msgid "Pool resource"
 msgstr ""
@@ -1649,7 +1649,7 @@ msgstr ""
 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:468 src/filed/job.c:1772
 #, c-format
 msgid "Could not open bootstrap file %s: ERR=%s\n"
 msgstr ""
@@ -1767,7 +1767,7 @@ msgstr ""
 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/job.c:145 src/dird/job.c:151 src/dird/job.c:966 src/dird/job.c:978
 #: src/dird/ua_cmds.c:690 src/dird/ua_cmds.c:1340 src/dird/ua_status.c:293
 msgid "unknown source"
 msgstr ""
@@ -1790,99 +1790,99 @@ msgstr ""
 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:394 src/dird/job.c:396 src/dird/job.c:943 src/dird/job.c:984
+#: src/dird/job.c:993
 msgid "Job resource"
 msgstr ""
 
-#: src/dird/job.c:411 src/dird/ua_cmds.c:696 src/dird/ua_cmds.c:1354
+#: src/dird/job.c:409 src/dird/ua_cmds.c:696 src/dird/ua_cmds.c:1354
 #: src/dird/ua_label.c:753
 msgid "Failed to connect to Storage daemon.\n"
 msgstr ""
 
-#: src/dird/job.c:456
+#: src/dird/job.c:454
 msgid "Max wait time exceeded. Job canceled.\n"
 msgstr ""
 
-#: src/dird/job.c:461
+#: src/dird/job.c:459
 msgid "Max run time exceeded. Job canceled.\n"
 msgstr ""
 
-#: src/dird/job.c:555 src/dird/job.c:604
+#: src/dird/job.c:553 src/dird/job.c:602
 #, 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:628 src/dird/ua_output.c:630
 #, 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:632 src/dird/ua_output.c:638
 #, c-format
 msgid "Pool %s created in database.\n"
 msgstr ""
 
-#: src/dird/job.c:643 src/dird/job.c:927
+#: src/dird/job.c:641 src/dird/job.c:930
 msgid "Run pool override"
 msgstr ""
 
-#: src/dird/job.c:653
+#: src/dird/job.c:651
 msgid "Run FullPool override"
 msgstr ""
 
-#: src/dird/job.c:655
+#: src/dird/job.c:653
 msgid "Job FullPool override"
 msgstr ""
 
-#: src/dird/job.c:663
+#: src/dird/job.c:661
 msgid "Run IncPool override"
 msgstr ""
 
-#: src/dird/job.c:665
+#: src/dird/job.c:663
 msgid "Job IncPool override"
 msgstr ""
 
-#: src/dird/job.c:673
+#: src/dird/job.c:671
 msgid "Run DiffPool override"
 msgstr ""
 
-#: src/dird/job.c:675
+#: src/dird/job.c:673
 msgid "Job DiffPool override"
 msgstr ""
 
-#: src/dird/job.c:700 src/stored/bscan.c:962
+#: src/dird/job.c:698 src/stored/bscan.c:962
 #, c-format
 msgid "Could not create Client record. ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:736
+#: src/dird/job.c:734
 msgid "FileSet MD5 digest not found.\n"
 msgstr ""
 
-#: src/dird/job.c:741
+#: src/dird/job.c:739
 #, c-format
 msgid "Could not create FileSet \"%s\" record. ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:781
+#: src/dird/job.c:779
 #, c-format
 msgid "Error updating job record. %s"
 msgstr ""
 
-#: src/dird/job.c:932
+#: src/dird/job.c:935
 msgid "Run storage override"
 msgstr ""
 
-#: src/dird/job.c:1045 src/dird/ua_run.c:389
+#: src/dird/job.c:1055 src/dird/ua_run.c:389
 msgid "No storage specified.\n"
 msgstr ""
 
-#: src/dird/job.c:1206
+#: src/dird/job.c:1216
 msgid "Could not start clone job.\n"
 msgstr ""
 
-#: src/dird/job.c:1208
+#: src/dird/job.c:1218
 #, c-format
 msgid "Clone JobId %d started.\n"
 msgstr ""
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "Storage from Pool's NextPool resource"
 msgstr ""
 
-#: src/dird/msgchan.c:99 src/filed/job.c:1247
+#: src/dird/msgchan.c:99 src/filed/job.c:1248
 #: src/tray-monitor/tray-monitor.c:888
 msgid "Storage daemon"
 msgstr ""
@@ -2790,7 +2790,7 @@ msgstr ""
 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:441 src/filed/status.c:197 src/stored/status.c:424
 msgid "No Jobs running.\n"
 msgstr ""
 
@@ -3619,7 +3619,7 @@ msgid "Enter a list of directories to restore for found JobIds"
 msgstr ""
 
 #: src/dird/ua_restore.c:329 src/dird/ua_status.c:732 src/filed/status.c:254
-#: src/stored/status.c:495 src/wx-console/wxbconfigpanel.cpp:212
+#: src/stored/status.c:498 src/wx-console/wxbconfigpanel.cpp:212
 msgid "Cancel"
 msgstr ""
 
@@ -4163,27 +4163,27 @@ msgid "Levels:\n"
 msgstr ""
 
 #: src/dird/ua_run.c:782 src/filed/status.c:371 src/lib/util.c:329
-#: src/stored/status.c:534
+#: src/stored/status.c:537
 msgid "Base"
 msgstr ""
 
 #: src/dird/ua_run.c:783 src/filed/status.c:373 src/lib/util.c:331
-#: src/stored/status.c:536
+#: src/stored/status.c:539
 msgid "Full"
 msgstr ""
 
 #: src/dird/ua_run.c:784 src/filed/status.c:376 src/lib/util.c:334
-#: src/stored/status.c:539
+#: src/stored/status.c:542
 msgid "Incremental"
 msgstr ""
 
 #: src/dird/ua_run.c:785 src/filed/status.c:379 src/lib/util.c:337
-#: src/stored/status.c:542
+#: src/stored/status.c:545
 msgid "Differential"
 msgstr ""
 
 #: src/dird/ua_run.c:786 src/filed/status.c:382 src/lib/util.c:340
-#: src/stored/status.c:545
+#: src/stored/status.c:548
 msgid "Since"
 msgstr ""
 
@@ -4196,7 +4196,7 @@ msgid "Initialize Catalog"
 msgstr ""
 
 #: src/dird/ua_run.c:809 src/filed/status.c:385 src/lib/util.c:343
-#: src/stored/status.c:548
+#: src/stored/status.c:551
 msgid "Verify Catalog"
 msgstr ""
 
@@ -4761,13 +4761,13 @@ msgstr ""
 msgid "No Terminated Jobs.\n"
 msgstr ""
 
-#: src/dird/ua_status.c:689 src/filed/status.c:214 src/stored/status.c:456
+#: src/dird/ua_status.c:689 src/filed/status.c:214 src/stored/status.c:459
 msgid ""
 "\n"
 "Terminated Jobs:\n"
 msgstr ""
 
-#: src/dird/ua_status.c:690 src/filed/status.c:222 src/stored/status.c:463
+#: src/dird/ua_status.c:690 src/filed/status.c:222 src/stored/status.c:466
 msgid " JobId  Level    Files      Bytes   Status   Finished        Name \n"
 msgstr ""
 
@@ -4776,30 +4776,30 @@ msgid "====================================================================\n"
 msgstr ""
 
 #: src/dird/ua_status.c:722 src/filed/status.c:244 src/lib/util.c:179
-#: src/stored/status.c:485
+#: src/stored/status.c:488
 msgid "Created"
 msgstr ""
 
 #: src/dird/ua_status.c:726 src/filed/status.c:248 src/lib/util.c:192
-#: src/lib/util.c:259 src/stored/status.c:489
+#: src/lib/util.c:259 src/stored/status.c:492
 msgid "Error"
 msgstr ""
 
-#: src/dird/ua_status.c:729 src/filed/status.c:251 src/stored/status.c:492
+#: src/dird/ua_status.c:729 src/filed/status.c:251 src/stored/status.c:495
 msgid "Diffs"
 msgstr ""
 
 #: src/dird/ua_status.c:735 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/lib/util.c:255 src/stored/btape.c:1187 src/stored/status.c:501
 #: src/wx-console/wxbconfigpanel.cpp:201
 msgid "OK"
 msgstr ""
 
-#: src/dird/ua_status.c:738 src/filed/status.c:260 src/stored/status.c:501
+#: src/dird/ua_status.c:738 src/filed/status.c:260 src/stored/status.c:504
 msgid "Other"
 msgstr ""
 
-#: src/dird/ua_status.c:741 src/filed/status.c:271 src/stored/status.c:512
+#: src/dird/ua_status.c:741 src/filed/status.c:271 src/stored/status.c:515
 #, c-format
 msgid "%6d  %-6s %8s %10s  %-7s  %-8s %s\n"
 msgstr ""
@@ -6149,151 +6149,151 @@ msgstr ""
 msgid "Cannot open FileSet input file: %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:731
+#: src/filed/job.c:733
 #, c-format
 msgid "REGEX %s compile error. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:793
+#: src/filed/job.c:795
 #, 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:1009 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:1078 src/stored/fd_cmds.c:348
 #, c-format
 msgid "Could not create bootstrap file %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1179
+#: src/filed/job.c:1180
 #, 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:1188
 #, c-format
 msgid "Unknown backup level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1199
+#: src/filed/job.c:1200
 #, c-format
 msgid "Bad level command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1220
+#: src/filed/job.c:1221
 #, c-format
 msgid "Bad session command: %s"
 msgstr ""
 
-#: src/filed/job.c:1241
+#: src/filed/job.c:1242
 #, c-format
 msgid "Bad storage command: %s"
 msgstr ""
 
-#: src/filed/job.c:1250
+#: src/filed/job.c:1251
 #, c-format
 msgid "Failed to connect to Storage daemon: %s:%d\n"
 msgstr ""
 
-#: src/filed/job.c:1262
+#: src/filed/job.c:1263
 msgid "Failed to authenticate Storage daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1300
+#: src/filed/job.c:1301
 msgid "Cannot contact Storage daemon\n"
 msgstr ""
 
-#: src/filed/job.c:1318
+#: src/filed/job.c:1319
 #, c-format
 msgid "Bad response to append open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1323
+#: src/filed/job.c:1324
 msgid "Bad response from stored to open command\n"
 msgstr ""
 
-#: src/filed/job.c:1350
+#: src/filed/job.c:1351
 #, c-format
 msgid "Generate VSS snapshots. Driver=\"%s\", Drive(s)=\"%s\"\n"
 msgstr ""
 
-#: src/filed/job.c:1352
+#: src/filed/job.c:1353
 msgid "Generate VSS snapshots failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1359
+#: src/filed/job.c:1360
 #, 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:1367
 #, c-format
 msgid "VSS Writer (PrepareForBackup): %s\n"
 msgstr ""
 
-#: src/filed/job.c:1371
+#: src/filed/job.c:1372
 msgid "No drive letters found for generating VSS snapshots.\n"
 msgstr ""
 
-#: src/filed/job.c:1375
+#: src/filed/job.c:1376
 #, 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:1434
 msgid "Append Close with SD failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1437
+#: src/filed/job.c:1438
 #, c-format
 msgid "Bad status %d returned from Storage Daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1455
+#: src/filed/job.c:1456
 #, c-format
 msgid "VSS Writer (BackupComplete): %s\n"
 msgstr ""
 
-#: src/filed/job.c:1483
+#: src/filed/job.c:1484
 #, c-format
 msgid "2994 Bad verify command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1498 src/filed/job.c:1537
+#: src/filed/job.c:1499 src/filed/job.c:1538
 #, c-format
 msgid "2994 Bad verify level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1579
+#: src/filed/job.c:1580
 #, c-format
 msgid "Bad replace command. CMD=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1658
+#: src/filed/job.c:1659
 msgid "Improper calling sequence.\n"
 msgstr ""
 
-#: src/filed/job.c:1678
+#: src/filed/job.c:1679
 #, c-format
 msgid "Bad response to SD read open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1683
+#: src/filed/job.c:1684
 msgid "Bad response from stored to read open command\n"
 msgstr ""
 
-#: src/filed/job.c:1747
+#: src/filed/job.c:1748
 #, c-format
 msgid "Comm error with SD. bad response to %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1750
+#: src/filed/job.c:1751
 #, c-format
 msgid "Bad response to %s command. Wanted %s, got %s\n"
 msgstr ""
@@ -6563,7 +6563,7 @@ msgstr ""
 msgid "    %s%s Job started: %s\n"
 msgstr ""
 
-#: src/filed/status.c:169 src/stored/status.c:398
+#: src/filed/status.c:169 src/stored/status.c:401
 #, c-format
 msgid "    Files=%s Bytes=%s Bytes/sec=%s\n"
 msgstr ""
@@ -6582,8 +6582,8 @@ msgstr ""
 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:326 src/filed/status.c:350 src/stored/status.c:613
+#: src/stored/status.c:636
 #, c-format
 msgid "Bad .status command: %s\n"
 msgstr ""
@@ -6596,23 +6596,23 @@ msgstr ""
 msgid "2900 Bad .status command, wrong argument.\n"
 msgstr ""
 
-#: src/filed/status.c:388 src/stored/status.c:551
+#: src/filed/status.c:388 src/stored/status.c:554
 msgid "Init Catalog"
 msgstr ""
 
-#: src/filed/status.c:391 src/stored/status.c:554
+#: src/filed/status.c:391 src/stored/status.c:557
 msgid "Volume to Catalog"
 msgstr ""
 
-#: src/filed/status.c:394 src/stored/status.c:557
+#: src/filed/status.c:394 src/stored/status.c:560
 msgid "Disk to Catalog"
 msgstr ""
 
-#: src/filed/status.c:397 src/stored/status.c:560
+#: src/filed/status.c:397 src/stored/status.c:563
 msgid "Data"
 msgstr ""
 
-#: src/filed/status.c:403 src/lib/util.c:361 src/stored/status.c:566
+#: src/filed/status.c:403 src/lib/util.c:361 src/stored/status.c:569
 msgid "Unknown Job Level"
 msgstr ""
 
@@ -13345,50 +13345,55 @@ msgid ""
 "    pool=\"%s\" device=\"%s\"\n"
 msgstr ""
 
-#: src/stored/status.c:406
+#: src/stored/status.c:392
+#, c-format
+msgid "    spooling=%d despooling=%d despool_wait=%d\n"
+msgstr ""
+
+#: src/stored/status.c:409
 #, c-format
 msgid "    FDReadSeqNo=%s in_msg=%u out_msg=%d fd=%d\n"
 msgstr ""
 
-#: src/stored/status.c:412
+#: src/stored/status.c:415
 msgid "    FDSocket closed\n"
 msgstr ""
 
-#: src/stored/status.c:434
+#: src/stored/status.c:437
 msgid ""
 "\n"
 "Jobs waiting to reserve a drive:\n"
 msgstr ""
 
-#: src/stored/status.c:465
+#: src/stored/status.c:468
 msgid "===================================================================\n"
 msgstr ""
 
-#: src/stored/status.c:611
+#: src/stored/status.c:614
 msgid "3900 Bad .status command, missing argument.\n"
 msgstr ""
 
-#: src/stored/status.c:634
+#: src/stored/status.c:637
 msgid "3900 Bad .status command, wrong argument.\n"
 msgstr ""
 
-#: src/stored/status.c:648
+#: src/stored/status.c:651
 msgid "Bacula Storage: Idle"
 msgstr ""
 
-#: src/stored/status.c:659
+#: src/stored/status.c:662
 msgid "Bacula Storage: Running"
 msgstr ""
 
-#: src/stored/status.c:673
+#: src/stored/status.c:676
 msgid "Bacula Storage: Last Job Canceled"
 msgstr ""
 
-#: src/stored/status.c:677
+#: src/stored/status.c:680
 msgid "Bacula Storage: Last Job Failed"
 msgstr ""
 
-#: src/stored/status.c:681
+#: src/stored/status.c:684
 msgid "Bacula Storage: Last Job had Warnings"
 msgstr ""
 

diff --git a/bacula/projects b/bacula/projects
index 8be12a4433ef78009451f072469d81906bf4b4ac..a86f3c9258ab8f6d1d94d6c1b78a6e9043f1f378 100644 (file)
--- a/bacula/projects
+++ b/bacula/projects
@@ -1,7 +1,7 @@
                 
 Projects:
                      Bacula Projects Roadmap 
-                    Status updated 3 January 2007
+                    Status updated 12 January 2007
 
 Summary:
 Item  1:  Accurate restoration of renamed/deleted files
@@ -10,40 +10,40 @@ Item  3:  Implement Base jobs.
 Item  4:  Implement from-client and to-client on restore command line.
 Item  5:  Implement creation and maintenance of copy pools
 Item  6:  Merge multiple backups (Synthetic Backup or Consolidation).
-Item  8:  Deletion of Disk-Based Bacula Volumes
-Item  9:  Implement a Python interface to the Bacula catalog.
-Item 10:  Archival (removal) of User Files to Tape
-Item 11:  Add Plug-ins to the FileSet Include statements.
-Item 12:  Implement more Python events in Bacula.
-Item 13:  Quick release of FD-SD connection after backup.
-Item 14:  Implement huge exclude list support using hashing.
-Item 15:  Allow skipping execution of Jobs
-Item 16:  Tray monitor window cleanups
-Item 17:  Split documentation
-Item 18:  Automatic promotion of backup levels
-Item 19:  Add an override in Schedule for Pools based on backup types.
-Item 20:  An option to operate on all pools with update vol parameters
-Item 21:  Include JobID in spool file name
-Item 22:  Include timestamp of job launch in "stat clients" output
-Item 23:  Message mailing based on backup types
-Item 24:  Allow inclusion/exclusion of files in a fileset by creation/mod times
-Item 25:  Add a scheduling syntax that permits weekly rotations
-Item 26:  Improve Bacula's tape and drive usage and cleaning management.
-Item 27:  Implement support for stacking arbitrary stream filters, sinks.
-Item 28:  Allow FD to initiate a backup
-Item 29:  Directive/mode to backup only file changes, not entire file
-Item 30:  Automatic disabling of devices
-Item 31:  Incorporation of XACML2/SAML2 parsing
-Item 32:  Clustered file-daemons
-Item 33:  Commercial database support
-Item 34:  Archive data
-Item 35:  Filesystem watch triggered backup.
-Item 36:  Implement multiple numeric backup levels as supported by dump
-Item 37:  Implement a server-side compression feature
-Item 38:  Cause daemons to use a specific IP address to source communications
-Item 39:  Multiple threads in file daemon for the same job
-Item 40:  Restore only file attributes (permissions, ACL, owner, group...)
-Item 41:  Add an item to the restore option where you can select a pool
+Item  7:  Deletion of Disk-Based Bacula Volumes
+Item  8:  Implement a Python interface to the Bacula catalog.
+Item  9:  Archival (removal) of User Files to Tape
+Item 10:  Add Plug-ins to the FileSet Include statements.
+Item 11:  Implement more Python events in Bacula.
+Item 12:  Quick release of FD-SD connection after backup.
+Item 13:  Implement huge exclude list support using hashing.
+Item 14:  Allow skipping execution of Jobs
+Item 15:  Tray monitor window cleanups
+Item 16:  Split documentation
+Item 17:  Automatic promotion of backup levels
+Item 18:  Add an override in Schedule for Pools based on backup types.
+Item 10:  An option to operate on all pools with update vol parameters
+Item 20:  Include JobID in spool file name
+Item 21:  Include timestamp of job launch in "stat clients" output
+Item 22:  Message mailing based on backup types
+Item 23:  Allow inclusion/exclusion of files in a fileset by creation/mod times
+Item 24:  Add a scheduling syntax that permits weekly rotations
+Item 25:  Improve Bacula's tape and drive usage and cleaning management.
+Item 26:  Implement support for stacking arbitrary stream filters, sinks.
+Item 27:  Allow FD to initiate a backup
+Item 28:  Directive/mode to backup only file changes, not entire file
+Item 29:  Automatic disabling of devices
+Item 30:  Incorporation of XACML2/SAML2 parsing
+Item 31:  Clustered file-daemons
+Item 32:  Commercial database support
+Item 33:  Archive data
+Item 34:  Filesystem watch triggered backup.
+Item 35:  Implement multiple numeric backup levels as supported by dump
+Item 36:  Implement a server-side compression feature
+Item 37:  Cause daemons to use a specific IP address to source communications
+Item 38:  Multiple threads in file daemon for the same job
+Item 39:  Restore only file attributes (permissions, ACL, owner, group...)
+Item 40:  Add an item to the restore option where you can select a pool
 
 Below, you will find more information on future projects:
 
@@ -236,7 +236,7 @@ Item  6:  Merge multiple backups (Synthetic Backup or Consolidation).
           data can then be pruned (or not) from the catalog, possibly
           allowing older volumes to be recycled
 
-Item  8:  Deletion of Disk-Based Bacula Volumes
+Item  7:  Deletion of Disk-Based Bacula Volumes
   Date:   Nov 25, 2005
   Origin: Ross Boylan <RossBoylan at stanfordalumni dot org> (edited
           by Kern)
@@ -257,7 +257,7 @@ Item  8:  Deletion of Disk-Based Bacula Volumes
           The migration project should also remove a Volume that is
           migrated. This might also work for tape Volumes.
 
-Item  9:  Implement a Python interface to the Bacula catalog.
+Item  8:  Implement a Python interface to the Bacula catalog.
   Date:   28 October 2005
   Origin: Kern
   Status: 
@@ -268,7 +268,7 @@ Item  9:  Implement a Python interface to the Bacula catalog.
   Why:    This will permit users to customize Bacula through
           Python scripts.
 
-Item 10:  Archival (removal) of User Files to Tape
+Item  9:  Archival (removal) of User Files to Tape
 
   Date:   Nov. 24/2005 
 
@@ -297,7 +297,7 @@ Item 10:  Archival (removal) of User Files to Tape
           access time.  Then after another 6 months (or possibly as one
           storage pool gets full) data is migrated to Tape.
 
-Item 11:  Add Plug-ins to the FileSet Include statements.
+Item 10:  Add Plug-ins to the FileSet Include statements.
   Date:   28 October 2005
   Origin:
   Status: Partially coded in 1.37 -- much more to do.
@@ -313,7 +313,7 @@ Item 11:  Add Plug-ins to the FileSet Include statements.
           plug-in knows how to backup his Oracle database without
           stopping/starting it, for example.
 
-Item 12:  Implement more Python events in Bacula.
+Item 11:  Implement more Python events in Bacula.
   Date:   28 October 2005
   Origin: Kern
   Status: 
@@ -334,7 +334,7 @@ Item 12:  Implement more Python events in Bacula.
           jobs (possibly also scheduled jobs).
 
 
-Item 13:  Quick release of FD-SD connection after backup.
+Item 12:  Quick release of FD-SD connection after backup.
   Origin: Frank Volf (frank at deze dot org)
   Date:   17 November 2005
   Status:
@@ -373,7 +373,7 @@ Item 13:  Quick release of FD-SD connection after backup.
 
 
 
-Item 14:  Implement huge exclude list support using hashing.
+Item 13:  Implement huge exclude list support using hashing.
   Date:   28 October 2005
   Origin: Kern
   Status: 
@@ -390,7 +390,7 @@ Item 14:  Implement huge exclude list support using hashing.
           backup set will be *much* smaller.
 
 
-Item 15:  Allow skipping execution of Jobs
+Item 14:  Allow skipping execution of Jobs
   Date:   29 November 2005
   Origin: Florian Schnabel <florian.schnabel at docufy dot de>
   Status:
@@ -402,7 +402,7 @@ Item 15:  Allow skipping execution of Jobs
           and you won't get errors that way.
 
 
-Item 16:  Tray monitor window cleanups
+Item 15:  Tray monitor window cleanups
   Origin: Alan Brown ajb2 at mssl dot ucl dot ac dot uk
   Date:   24 July 2006
   Status:
@@ -413,7 +413,7 @@ Item 16:  Tray monitor window cleanups
           the trailing items difficult to read.
 
 
-Item 17:  Split documentation
+Item 16:  Split documentation
   Origin: Maxx <maxxatworkat gmail dot com>
   Date:   27th July 2006
   Status:
@@ -436,7 +436,7 @@ Item 17:  Split documentation
 
 
 
-Item 18:  Automatic promotion of backup levels
+Item 17:  Automatic promotion of backup levels
    Date:  19 January 2006
   Origin: Adam Thornton <athornton@sinenomine.net>
   Status: 
@@ -455,7 +455,7 @@ Item 18:  Automatic promotion of backup levels
           Amanda can do and we can't (at least, the one cool thing I know of).
 
 
-Item 19:  Add an override in Schedule for Pools based on backup types.
+Item 18:  Add an override in Schedule for Pools based on backup types.
 Date:     19 Jan 2005
 Origin:   Chad Slater <chad.slater@clickfox.com>
 Status: 
@@ -474,7 +474,7 @@ Status:
           backups, then the Full job would use the proper Storage device, which
           has more capacity (i.e. a 8TB tape library.
 
-Item 20:  An option to operate on all pools with update vol parameters
+Item 19:  An option to operate on all pools with update vol parameters
   Origin: Dmitriy Pinchukov <absh@bossdev.kiev.ua>
    Date:  16 August 2006
   Status:
@@ -490,7 +490,7 @@ Item 20:  An option to operate on all pools with update vol parameters
 
 
 
-Item 21:  Include JobID in spool file name
+Item 20:  Include JobID in spool file name
   Origin: Mark Bergman <mark.bergman@uphs.upenn.edu>
   Date:   Tue Aug 22 17:13:39 EDT 2006
   Status: Ok (patches/testing/project-include-jobid-in-spool-name.patch)
@@ -503,7 +503,7 @@ Item 21:  Include JobID in spool file name
 
 
 
-Item 22:  Include timestamp of job launch in "stat clients" output
+Item 21:  Include timestamp of job launch in "stat clients" output
   Origin: Mark Bergman <mark.bergman@uphs.upenn.edu>
   Date:   Tue Aug 22 17:13:39 EDT 2006
   Status:
@@ -523,7 +523,7 @@ Item 22:  Include timestamp of job launch in "stat clients" output
 
 
 
-Item 23:  Message mailing based on backup types
+Item 22:  Message mailing based on backup types
  Origin:  Evan Kaufman <evan.kaufman@gmail.com>
    Date:  January 6, 2006
  Status:
@@ -552,7 +552,7 @@ Item 23:  Message mailing based on backup types
    }
 
 
-Item 24:  Allow inclusion/exclusion of files in a fileset by creation/mod times
+Item 23:  Allow inclusion/exclusion of files in a fileset by creation/mod times
   Origin: Evan Kaufman <evan.kaufman@gmail.com>
   Date:   January 11, 2006
   Status:
@@ -602,7 +602,7 @@ Item 24:  Allow inclusion/exclusion of files in a fileset by creation/mod times
            or 'since'.
 
 
-Item 25:  Add a scheduling syntax that permits weekly rotations
+Item 24:  Add a scheduling syntax that permits weekly rotations
    Date:  15 December 2006
   Origin: Gregory Brauer (greg at wildbrain dot com)
   Status:
@@ -695,7 +695,7 @@ Item 25:  Add a scheduling syntax that permits weekly rotations
           }
 
 
-Item 26:  Improve Bacula's tape and drive usage and cleaning management.
+Item 25:  Improve Bacula's tape and drive usage and cleaning management.
   Date:   8 November 2005, November 11, 2005
   Origin: Adam Thornton <athornton at sinenomine dot net>,
           Arno Lehmann <al at its-lehmann dot de>
@@ -763,7 +763,7 @@ Item 26:  Improve Bacula's tape and drive usage and cleaning management.
           sub-projects: Measuring Tape and Drive usage, retiring
           volumes, and handling drive cleaning and TAPEALERTs.
 
-Item 27:  Implement support for stacking arbitrary stream filters, sinks.
+Item 26:  Implement support for stacking arbitrary stream filters, sinks.
 Date:     23 November 2006
 Origin:   Landon Fuller <landonf@threerings.net>
 Status:   Planning. Assigned to landonf.
@@ -799,7 +799,7 @@ Status:   Planning. Assigned to landonf.
 
           Assistance with either code or testing would be fantastic.
 
-Item 28:  Allow FD to initiate a backup
+Item 27:  Allow FD to initiate a backup
   Origin: Frank Volf (frank at deze dot org)
   Date:   17 November 2005
   Status:
@@ -811,7 +811,7 @@ Item 28:  Allow FD to initiate a backup
 
    Why:   Makes backup of laptops much easier.
 
-Item 29:  Directive/mode to backup only file changes, not entire file
+Item 28:  Directive/mode to backup only file changes, not entire file
   Date:   11 November 2005
   Origin: Joshua Kugler <joshua dot kugler at uaf dot edu>
           Marek Bajon <mbajon at bimsplus dot com dot pl>
@@ -828,7 +828,7 @@ Item 29:  Directive/mode to backup only file changes, not entire file
   Notes:  This would require the usage of disk-based volumes as comparing 
           files would not be feasible using a tape drive.
 
-Item 30:  Automatic disabling of devices
+Item 29:  Automatic disabling of devices
    Date:  2005-11-11
   Origin: Peter Eriksson <peter at ifm.liu dot se>
   Status:
@@ -854,7 +854,7 @@ Item 30:  Automatic disabling of devices
           further use of that drive and used one of the other ones
           instead.
 
-Item 31:  Incorporation of XACML2/SAML2 parsing
+Item 30:  Incorporation of XACML2/SAML2 parsing
    Date:   19 January 2006
    Origin: Adam Thornton <athornton@sinenomine.net>
    Status: Blue sky
@@ -892,7 +892,7 @@ Item 31:  Incorporation of XACML2/SAML2 parsing
           high, but they're largely both external to Bacula and already sunk.
 
 
-Item 32:  Clustered file-daemons
+Item 31:  Clustered file-daemons
   Origin: Alan Brown ajb2 at mssl dot ucl dot ac dot uk
   Date:   24 July 2006
   Status:
@@ -924,7 +924,7 @@ Item 32:  Clustered file-daemons
 
    Notes:
 
-Item 33:  Commercial database support
+Item 32:  Commercial database support
   Origin: Russell Howe <russell_howe dot wreckage dot org>
   Date:   26 July 2006
   Status:
@@ -946,7 +946,7 @@ Item 33:  Commercial database support
           than having to run a second DBMS.
 
 
-Item 34:  Archive data
+Item 33:  Archive data
   Date:   15/5/2006
   Origin: calvin streeting calvin at absentdream dot com
   Status:
@@ -977,7 +977,7 @@ Item 34:  Archive data
           save the catalog with the disk as some kind of menu
           system 
 
-Item 35:  Filesystem watch triggered backup.
+Item 34:  Filesystem watch triggered backup.
   Date:   31 August 2006
   Origin: Jesper Krogh <jesper@krogh.cc>
   Status: Unimplemented, depends probably on "client initiated backups"
@@ -1002,7 +1002,7 @@ Kern Notes: I would rather see this implemented by an external program
           that monitors the Filesystem changes, then uses the console
           to start the appropriate job.
 
-Item 36:  Implement multiple numeric backup levels as supported by dump
+Item 35:  Implement multiple numeric backup levels as supported by dump
 Date:     3 April 2006
 Origin:   Daniel Rich <drich@employees.org>
 Status:
@@ -1023,7 +1023,7 @@ Why:      Support of multiple backup levels would provide for more advanced back
 Notes:    Legato Networker supports a similar system with full, incr, and 1-9 as
           levels.
 
-Item 37:  Implement a server-side compression feature
+Item 36:  Implement a server-side compression feature
   Date:   18 December 2006
   Origin: Vadim A. Umanski , e-mail umanski@ext.ru
   Status:
@@ -1044,7 +1044,7 @@ Item 37:  Implement a server-side compression feature
           That's why the server-side compression feature is needed!
   Notes:
 
-Item 38:  Cause daemons to use a specific IP address to source communications
+Item 37:  Cause daemons to use a specific IP address to source communications
  Origin:  Bill Moran <wmoran@collaborativefusion.com>
  Date:    18 Dec 2006
  Status:
@@ -1073,7 +1073,7 @@ Item 38:  Cause daemons to use a specific IP address to source communications
           10.0.0.1 and zone transfers will always originate from
           10.0.0.2.
 
-Item 39:  Multiple threads in file daemon for the same job
+Item 38:  Multiple threads in file daemon for the same job
   Date:   27 November 2005
   Origin: Ove Risberg (Ove.Risberg at octocode dot com)
   Status:
@@ -1095,7 +1095,7 @@ Item 39:  Multiple threads in file daemon for the same job
   Why:    Multiple concurrent backups of a large fileserver with many
           disks and controllers will be much faster.
 
-Item 40:  Restore only file attributes (permissions, ACL, owner, group...)
+Item 39:  Restore only file attributes (permissions, ACL, owner, group...)
   Origin: Eric Bollengier
   Date:   30/12/2006
   Status:
@@ -1114,7 +1114,7 @@ Item 40:  Restore only file attributes (permissions, ACL, owner, group...)
           If the file isn't here, we can create an empty one and apply
           rights or do nothing.
 
-Item 41:  Add an item to the restore option where you can select a pool
+Item 40:  Add an item to the restore option where you can select a pool
   Origin: kshatriyak at gmail dot com
     Date: 1/1/2006
   Status:

diff --git a/bacula/src/win32/installer/winbacula.nsi b/bacula/src/win32/installer/winbacula.nsi
index 861e95884e2462ae34f93a1ad483fd4296fbdb2b..ccd82a06cb708de7faf605afdbae3ec2d8f21906 100644 (file)
--- a/bacula/src/win32/installer/winbacula.nsi
+++ b/bacula/src/win32/installer/winbacula.nsi
@@ -834,7 +834,7 @@ Section "Documentation (HTML Format)" SecDocHtml
   File "${SRC_DIR}\manual\bacula\*.html"
   File "${SRC_DIR}\manual\bacula\*.png"
   File "${SRC_DIR}\manual\bacula\*.css"
-  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Manual (HTML).lnk" '"$INSTDIR\doc\bacula.html"'
+  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Manual (HTML).lnk" '"$INSTDIR\doc\index.html"'
 SectionEnd
 
 SectionGroupEnd

diff --git a/bacula/technotes-2.0 b/bacula/technotes-2.0
index 6939350b0b50609832d5d04c4dc26c2c6f6576ce..65f245c4d9f11d9ecf15cc516c44977d83dc0e07 100644 (file)
--- a/bacula/technotes-2.0
+++ b/bacula/technotes-2.0
@@ -3,6 +3,8 @@
 General:
 Version 2.0.1
 12Jan07
+kes  Fix Bacula->Documentation link on Win32 to point to index.html
+     instead of bacula.html. Fixed bug #750.
 kes  Return JobId in db_get_job_record() when JobId==0. This should
      fix bug #741.
 kes  Do not release source pointers when restarting a failed job.