From 564770d267c39edb67d031d79b979091351f682a Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 12 Jan 2007 16:34:05 +0000 Subject: [PATCH] Final changes git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.0@3987 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/ChangeLog | 2 + bacula/ReleaseNotes | 2 + bacula/po/bacula.pot | 239 ++++++++++++----------- bacula/po/de.gmo | Bin 479 -> 479 bytes bacula/po/de.po | 239 ++++++++++++----------- bacula/po/es.gmo | Bin 426 -> 426 bytes bacula/po/es.po | 239 ++++++++++++----------- bacula/po/fr.gmo | Bin 97375 -> 110756 bytes bacula/po/fr.po | 239 ++++++++++++----------- bacula/po/it.gmo | Bin 470 -> 470 bytes bacula/po/it.po | 239 ++++++++++++----------- bacula/projects | 138 ++++++------- bacula/src/win32/installer/winbacula.nsi | 2 +- bacula/technotes-2.0 | 2 + 14 files changed, 686 insertions(+), 655 deletions(-) diff --git a/bacula/ChangeLog b/bacula/ChangeLog index 74df294b64..04e8e885f4 100644 --- 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 fa4426769d..52bc7d2797 100644 --- 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 04be90ea45..d23bb42899 100644 --- 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 \n" "Language-Team: LANGUAGE \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 GIT binary patch delta 24 fcmcc5e4ly33SM(v14CUyBLzcqD`SI=TeTPgVW9^V delta 24 fcmcc5e4ly33SKi^LnB=y3k5?\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 GIT binary patch delta 23 fcmZ3*yo!0k3SM(v14CUyBLzcqD`SI+TfYJTQQHSq delta 23 fcmZ3*yo!0k3SKi^LnB=y3k5?\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 GIT binary patch delta 31170 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 delta 21638 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 diff --git a/bacula/po/fr.po b/bacula/po/fr.po index 2791317185..5b2b79a6ed 100644 --- 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 \n" "Language-Team: French \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 GIT binary patch delta 24 fcmcb{e2sa+3SM(v14CUyBLzcqD`SI=TNN1rU-1U| delta 24 fcmcb{e2sa+3SKi^LnB=y3k5?\n" "Language-Team: Italian \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 8be12a4433..a86f3c9258 100644 --- 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 (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 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 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 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 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 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 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 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 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 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 , Arno Lehmann @@ -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 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 Marek Bajon @@ -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 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 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 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 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 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 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 861e95884e..ccd82a06cb 100644 --- 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 6939350b0b..65f245c4d9 100644 --- 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. -- 2.39.5