From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 7 Jul 2008 21:08:50 +0000 (+0000)
Subject: Final changes
X-Git-Tag: Release-2.4.1~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=25dcac78d1991ac068af8b42f67252ec34bbdcd1;p=bacula%2Fbacula

Final changes

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

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index b33dfe17f9..5ea287e32f 100644
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,6 +1,23 @@
               Technical notes on version 2.4.x
 
 General:
+Release Version 2.4.1
+07Jul08
+kes  Clear in-use bit on vol when unused while swapping.
+06Jul08
+kes  Remove sleep at end of ./bacula
+kes  Clear hash packet for hardlinked files correctly. This corrects
+     a long standing bug where hardlinked files selected individually
+     would occasionally not be restored.
+05Jul08
+kes  Apply Eric's patch to ensure that autoprune does not return
+     a Volume not in the autochanger unless requested to do so.
+kes  Correct bat restore display of multiple drives. This fixes    
+     bug #1117.
+kes  Do find_a_volume() each time an unload is done. This
+     fixes the failure of maxvol2-test.
+
+
 Release Beta version 2.4.1-b2
 04Jul08 
 kes  Use Qmsg() in job.c watchdog callback.
diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index ec08701554..b814a3ae79 100644
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -14,62 +14,61 @@ reparse directories backed up, you must explicitly include them
 in your FileSet.
 ==============================================================
 
-Release Beta version 2.4.1-b2
-kes  Use Qmsg() in job.c watchdog callback.
-kes  Release main control rwlock if ABORTing.
-kes  Make watchdog connect timeout queue messages rather than sending
-     directly to avoid lock conflicts with the real thread.
-kes  Remove const char that causes problems with Python, which has
-     older 'incorrect' headers.
-kes  Add const char in dbd.c to avoid compiler warnings.
-kes  Fix mtx-changer to detect both versions of Ubuntu (Debian)
-     mt. This fixes bug #1116.
-kes  Fix failure of 2drive-concurrent-test. Always read label;
-     clear_unload() only after drive is defined in acquire_for_read().
-
-
-==========
-Release 2.4.1-b1
-
-This release consists of a number of bug fixes since version 2.4.0.
-Important sections of the Storage daemon mount system have been
-enhanced to correctly loading autochanger volumes when the drive
-is empty and to handle manual tape changes.  Hopefully this will
-resolve all the manual mount problems.
-
-Bugs Fixed (hopefully -- not all confirmed):
+Bugs Fixed:
  1103, 1100, 1105, 1094, 1109, 1106, 1101, 1102, 1112               
-
-Release Beta version 2.4.1-b1
--  Back out bad src/lib/base64.c change.
+ 1117, 1116, 1097.
+
+Change summary:
+-  Clear in-use bit on vol when unused while swapping.
+-  Remove sleep at end of ./bacula
+-  Clear hash packet for hardlinked files correctly. This corrects
+   a long standing bug where hardlinked files selected individually
+   would occasionally not be restored.
+-  Apply Eric's patch to ensure that autoprune does not return
+   a Volume not in the autochanger unless requested to do so.
+-  Correct bat restore display of multiple drives. This fixes    
+   bug #1117.
+-  Do find_a_volume() each time an unload is done. This
+   fixes the failure of maxvol2-test.
+-  Use Qmsg() in job.c watchdog callback.
+-  Release main control rwlock if ABORTing.
+-  Make watchdog connect timeout queue messages rather than sending
+   directly to avoid lock conflicts with the real thread.
+-  Remove const char that causes problems with Python, which has
+   older 'incorrect' headers.
+-  Add const char in dbd.c to avoid compiler warnings.
+-  Fix mtx-changer to detect both versions of Ubuntu (Debian)
+   mt. This fixes bug #1116.
+-  Fix failure of 2drive-concurrent-test. Always read label;
+   clear_unload() only after drive is defined in acquire_for_read().
 -  Generally clean up the manual tape loading code. The main
-     conceptial change is that when a volume is marked to be unloaded,
-     its volume name is retained, and it is only marked as unloaded
-     when either the autoloader says it is unloaded or another tape
-     is read on that drive.
+   conceptial change is that when a volume is marked to be unloaded,
+   its volume name is retained, and it is only marked as unloaded
+   when either the autoloader says it is unloaded or another tape
+   is read on that drive.
 -  Fix a recycling problem with two autochangers reported in bug
-     #1106. This may also (unlikely) fix a second recycling bug as
-     reported in #1103.
+   #1106. This may also (unlikely) fix a second recycling bug as
+   reported in #1103.
 -  Fix a SD lock volumes deadlock problem reported in bug #1100.
 -  Fix format problem in bscan output reported in bug #1105.
 -  Copy more data when restarting a job so that run
-     overrides are kept. This should fix bug #1094.
+   overrides are kept. This should fix bug #1094.
 -  Backport updates to jobq.c where possible.
 -  Fix bug where SD did not ask operator if the device could not
-     be opened. Reported by Eric.
+   be opened. Reported by Eric.
 -  Add dbuser to DIR conf file (replaces user).
 -  Add --with-db-password to ./configure
 -  Fix regress to handle db_password.
 -  Fix a couple of pedantic compiler warnings.
 -  Fix bug when starting a restore on a storage that doesn't
-     have the requested MediaType.
+   have the requested MediaType.
 -  More work on word alignments -- eliminate all ints from
-     the configuration routines.
+   the configuration routines.
 -  Fix bug reported by Scott Barninger where the bacula script
-     refers to scripts in the wrong directory. Needed to meet the
-     requirements of recent FHS location changes.
+   refers to scripts in the wrong directory. Needed to meet the
+   requirements of recent FHS location changes.
 -  Fix word alignment problem on non-Intel 64 bit machines
-     such as Solaris.  This should fix bug #1097 -- bus error in SD.
+   such as Solaris.  This should fix bug #1097 -- bus error in SD.
 -  Add missing win32/patches/wxWidgets.patch to 2.4 repository.
 
 =====================
diff --git a/bacula/po/bacula.pot b/bacula/po/bacula.pot
index 327694d97d..825043c362 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: 2008-07-04 16:22+0200\n"
+"POT-Creation-Date: 2008-07-07 23:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -7581,7 +7581,7 @@ msgstr ""
 msgid "End Session"
 msgstr ""
 
-#: src/stored/read_record.c:407 src/stored/label.c:1049
+#: src/stored/read_record.c:407 src/stored/label.c:1053
 msgid "End of Media"
 msgstr ""
 
@@ -7624,26 +7624,26 @@ msgstr ""
 msgid "Unable to initialize volume list lock. ERR=%s\n"
 msgstr ""
 
-#: src/stored/reserve.c:444
+#: src/stored/reserve.c:442
 #, c-format
 msgid "Device switch. New device %s chosen.\n"
 msgstr ""
 
-#: src/stored/reserve.c:511
+#: src/stored/reserve.c:509
 #, c-format
 msgid "Hey! num_writers=%d!!!!\n"
 msgstr ""
 
-#: src/stored/reserve.c:763
+#: src/stored/reserve.c:752
 msgid "3939 Could not get dcr\n"
 msgstr ""
 
-#: src/stored/reserve.c:866 src/stored/reserve.c:877
+#: src/stored/reserve.c:855 src/stored/reserve.c:866
 #, c-format
 msgid "Failed command: %s\n"
 msgstr ""
 
-#: src/stored/reserve.c:867
+#: src/stored/reserve.c:856
 #, c-format
 msgid ""
 "\n"
@@ -7651,7 +7651,7 @@ msgid ""
 "Device resources.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1183 src/stored/dircmd.c:601
+#: src/stored/reserve.c:1172 src/stored/dircmd.c:601
 #, c-format
 msgid ""
 "\n"
@@ -7659,80 +7659,80 @@ msgid ""
 "does not exist.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1187 src/stored/dircmd.c:579
+#: src/stored/reserve.c:1176 src/stored/dircmd.c:579
 #, c-format
 msgid ""
 "\n"
 "     Device \"%s\" requested by DIR could not be opened or does not exist.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1199
+#: src/stored/reserve.c:1188
 #, c-format
 msgid "3926 Could not get dcr for device: %s\n"
 msgstr ""
 
-#: src/stored/reserve.c:1322
+#: src/stored/reserve.c:1311
 #, c-format
 msgid "3601 JobId=%u device %s is BLOCKED due to user unmount.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1332
+#: src/stored/reserve.c:1321
 #, c-format
 msgid "3602 JobId=%u device %s is busy (already reading/writing).\n"
 msgstr ""
 
-#: src/stored/reserve.c:1376
+#: src/stored/reserve.c:1365
 #, c-format
 msgid "3603 JobId=%u device %s is busy reading.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1385
+#: src/stored/reserve.c:1374
 #, c-format
 msgid "3604 JobId=%u device %s is BLOCKED due to user unmount.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1422
+#: src/stored/reserve.c:1411
 #, c-format
 msgid ""
 "3608 JobId=%u wants Pool=\"%s\" but have Pool=\"%s\" nreserve=%d on drive %"
 "s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1448
+#: src/stored/reserve.c:1437
 #, c-format
 msgid "3610 JobId=%u Volume max jobs exceeded on drive %s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1503
+#: src/stored/reserve.c:1492
 #, c-format
 msgid "3605 JobId=%u wants free drive but device %s is busy.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1511
+#: src/stored/reserve.c:1500
 #, c-format
 msgid "3606 JobId=%u prefers mounted drives, but drive %s has no Volume.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1534
+#: src/stored/reserve.c:1523
 #, c-format
 msgid "3607 JobId=%u wants Vol=\"%s\" drive has Vol=\"%s\" on drive %s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1590
+#: src/stored/reserve.c:1579
 #, c-format
 msgid "Logic error!!!! JobId=%u Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1591
+#: src/stored/reserve.c:1580
 #, c-format
 msgid "3910 JobId=%u Logic error!!!! drive %s Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1594
+#: src/stored/reserve.c:1583
 msgid "Logic error!!!! Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1597
+#: src/stored/reserve.c:1586
 #, c-format
 msgid "3911 JobId=%u failed reserve drive %s.\n"
 msgstr ""
@@ -7802,11 +7802,11 @@ msgstr ""
 msgid "EOT label not copied.\n"
 msgstr ""
 
-#: src/stored/bcopy.c:319 src/stored/label.c:1043 src/stored/bls.c:423
+#: src/stored/bcopy.c:319 src/stored/label.c:1047 src/stored/bls.c:423
 msgid "Begin Job Session"
 msgstr ""
 
-#: src/stored/bcopy.c:323 src/stored/label.c:1046 src/stored/bls.c:427
+#: src/stored/bcopy.c:323 src/stored/label.c:1050 src/stored/bls.c:427
 msgid "End Job Session"
 msgstr ""
 
@@ -7814,7 +7814,7 @@ msgstr ""
 msgid "End of Medium"
 msgstr ""
 
-#: src/stored/bcopy.c:331 src/stored/label.c:1055 src/stored/bls.c:434
+#: src/stored/bcopy.c:331 src/stored/label.c:1059 src/stored/bls.c:434
 msgid "Unknown"
 msgstr ""
 
@@ -8001,7 +8001,7 @@ msgstr ""
 msgid "Volume on %s has bad Bacula label type: %x\n"
 msgstr ""
 
-#: src/stored/label.c:259 src/stored/label.c:416 src/stored/mount.c:429
+#: src/stored/label.c:259 src/stored/label.c:420 src/stored/mount.c:435
 #: src/stored/acquire.c:180
 #, c-format
 msgid "Could not reserve volume %s on %s\n"
@@ -8012,57 +8012,57 @@ msgstr ""
 msgid "Cannot write Volume label to block for device %s\n"
 msgstr ""
 
-#: src/stored/label.c:346 src/stored/label.c:444
+#: src/stored/label.c:350 src/stored/label.c:448
 #, c-format
 msgid "Open device %s Volume \"%s\" failed: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:468
+#: src/stored/label.c:472
 #, c-format
 msgid "Rewind error on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:476
+#: src/stored/label.c:480
 #, c-format
 msgid "Truncate error on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:482
+#: src/stored/label.c:486
 #, c-format
 msgid "Failed to re-open DVD after truncate on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:505
+#: src/stored/label.c:509
 #, c-format
 msgid "Unable to write device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:534
+#: src/stored/label.c:538
 #, c-format
 msgid "Recycled volume \"%s\" on device %s, all previous data lost.\n"
 msgstr ""
 
-#: src/stored/label.c:537
+#: src/stored/label.c:541
 #, c-format
 msgid "Wrote label to prelabeled Volume \"%s\" on device %s\n"
 msgstr ""
 
-#: src/stored/label.c:736
+#: src/stored/label.c:740
 #, c-format
 msgid "Bad Volume session label = %d\n"
 msgstr ""
 
-#: src/stored/label.c:791
+#: src/stored/label.c:795
 #, c-format
 msgid "Expecting Volume Label, got FI=%s Stream=%s len=%d\n"
 msgstr ""
 
-#: src/stored/label.c:918
+#: src/stored/label.c:922
 #, c-format
 msgid "Unknown %d"
 msgstr ""
 
-#: src/stored/label.c:922
+#: src/stored/label.c:926
 #, c-format
 msgid ""
 "\n"
@@ -8079,17 +8079,17 @@ msgid ""
 "HostName          : %s\n"
 msgstr ""
 
-#: src/stored/label.c:944
+#: src/stored/label.c:948
 #, c-format
 msgid "Date label written: %s\n"
 msgstr ""
 
-#: src/stored/label.c:950
+#: src/stored/label.c:954
 #, c-format
 msgid "Date label written: %04d-%02d-%02d at %02d:%02d\n"
 msgstr ""
 
-#: src/stored/label.c:970
+#: src/stored/label.c:974
 #, c-format
 msgid ""
 "\n"
@@ -8102,7 +8102,7 @@ msgid ""
 "ClientName        : %s\n"
 msgstr ""
 
-#: src/stored/label.c:983
+#: src/stored/label.c:987
 #, c-format
 msgid ""
 "Job (unique name) : %s\n"
@@ -8111,7 +8111,7 @@ msgid ""
 "JobLevel          : %c\n"
 msgstr ""
 
-#: src/stored/label.c:992
+#: src/stored/label.c:996
 #, c-format
 msgid ""
 "JobFiles          : %s\n"
@@ -8124,48 +8124,48 @@ msgid ""
 "JobStatus         : %c\n"
 msgstr ""
 
-#: src/stored/label.c:1013
+#: src/stored/label.c:1017
 #, c-format
 msgid "Date written      : %s\n"
 msgstr ""
 
-#: src/stored/label.c:1018
+#: src/stored/label.c:1022
 #, c-format
 msgid "Date written      : %04d-%02d-%02d at %02d:%02d\n"
 msgstr ""
 
-#: src/stored/label.c:1037
+#: src/stored/label.c:1041
 msgid "Fresh Volume"
 msgstr ""
 
-#: src/stored/label.c:1040
+#: src/stored/label.c:1044
 msgid "Volume"
 msgstr ""
 
-#: src/stored/label.c:1052
+#: src/stored/label.c:1056
 msgid "End of Tape"
 msgstr ""
 
-#: src/stored/label.c:1072 src/stored/label.c:1080 src/stored/label.c:1113
+#: src/stored/label.c:1076 src/stored/label.c:1084 src/stored/label.c:1117
 #, c-format
 msgid "%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d DataLen=%d\n"
 msgstr ""
 
-#: src/stored/label.c:1077
+#: src/stored/label.c:1081
 msgid "End of physical tape.\n"
 msgstr ""
 
-#: src/stored/label.c:1092 src/stored/label.c:1101
+#: src/stored/label.c:1096 src/stored/label.c:1105
 #, c-format
 msgid "%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d\n"
 msgstr ""
 
-#: src/stored/label.c:1094
+#: src/stored/label.c:1098
 #, c-format
 msgid "   Job=%s Date=%s Level=%c Type=%c\n"
 msgstr ""
 
-#: src/stored/label.c:1103
+#: src/stored/label.c:1107
 #, c-format
 msgid "   Date=%s Level=%c Type=%c Files=%s Bytes=%s Errors=%d Status=%c\n"
 msgstr ""
@@ -10266,7 +10266,7 @@ msgstr ""
 msgid "Read block=%u, VolBytes=%s rate=%.1f KB/s\n"
 msgstr ""
 
-#: src/stored/btape.c:2757 src/stored/mount.c:785
+#: src/stored/btape.c:2757 src/stored/mount.c:791
 #, c-format
 msgid "Cannot open Dev=%s, Vol=%s\n"
 msgstr ""
@@ -10455,32 +10455,32 @@ msgstr ""
 msgid "Error updating file attributes. ERR=%s\n"
 msgstr ""
 
-#: src/stored/mount.c:94
+#: src/stored/mount.c:95
 #, c-format
 msgid "Too many errors trying to mount device %s.\n"
 msgstr ""
 
-#: src/stored/mount.c:102
+#: src/stored/mount.c:103
 #, c-format
 msgid "Job %d canceled.\n"
 msgstr ""
 
-#: src/stored/mount.c:260
+#: src/stored/mount.c:266
 #, c-format
 msgid "Volume \"%s\" previously written, moving to end of data.\n"
 msgstr ""
 
-#: src/stored/mount.c:264
+#: src/stored/mount.c:270
 #, c-format
 msgid "Unable to position to end of data on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/mount.c:377 src/stored/mount.c:649
+#: src/stored/mount.c:383 src/stored/mount.c:655
 #, c-format
 msgid "Volume \"%s\" not on device %s.\n"
 msgstr ""
 
-#: src/stored/mount.c:410
+#: src/stored/mount.c:416
 #, c-format
 msgid ""
 "Director wanted Volume \"%s\".\n"
@@ -10488,69 +10488,69 @@ msgid ""
 "    %s"
 msgstr ""
 
-#: src/stored/mount.c:543
+#: src/stored/mount.c:548
 #, c-format
 msgid "Ready to append to end of Volume \"%s\" part=%d size=%s\n"
 msgstr ""
 
-#: src/stored/mount.c:547
+#: src/stored/mount.c:552
 #, c-format
 msgid ""
 "Bacula cannot write on DVD Volume \"%s\" because: The sizes do not match! "
 "Volume=%s Catalog=%s\n"
 msgstr ""
 
-#: src/stored/mount.c:561
+#: src/stored/mount.c:566
 #, c-format
 msgid "Ready to append to end of Volume \"%s\" at file=%d.\n"
 msgstr ""
 
-#: src/stored/mount.c:564
+#: src/stored/mount.c:569
 #, c-format
 msgid ""
 "Bacula cannot write on tape Volume \"%s\" because:\n"
 "The number of files mismatch! Volume=%u Catalog=%u\n"
 msgstr ""
 
-#: src/stored/mount.c:575
+#: src/stored/mount.c:580
 #, c-format
 msgid "Ready to append to end of Volume \"%s\" size=%s\n"
 msgstr ""
 
-#: src/stored/mount.c:579
+#: src/stored/mount.c:584
 #, c-format
 msgid ""
 "Bacula cannot write on disk Volume \"%s\" because: The sizes do not match! "
 "Volume=%s Catalog=%s\n"
 msgstr ""
 
-#: src/stored/mount.c:639
+#: src/stored/mount.c:645
 #, c-format
 msgid "Labeled new Volume \"%s\" on device %s.\n"
 msgstr ""
 
-#: src/stored/mount.c:644
+#: src/stored/mount.c:650
 #, c-format
 msgid "Device %s not configured to autolabel Volumes.\n"
 msgstr ""
 
-#: src/stored/mount.c:663
+#: src/stored/mount.c:669
 #, c-format
 msgid "Marking Volume \"%s\" in Error in Catalog.\n"
 msgstr ""
 
-#: src/stored/mount.c:680
+#: src/stored/mount.c:686
 #, c-format
 msgid ""
 "Autochanger Volume \"%s\" not found in slot %d.\n"
 "    Setting InChanger to zero in catalog.\n"
 msgstr ""
 
-#: src/stored/mount.c:699
+#: src/stored/mount.c:705
 msgid "Hey!!!!! WroteVol non-zero !!!!!\n"
 msgstr ""
 
-#: src/stored/mount.c:748
+#: src/stored/mount.c:754
 #, c-format
 msgid ""
 "Invalid tape position on volume \"%s\" on device %s. Expected %d, got %d\n"
diff --git a/bacula/po/de.po b/bacula/po/de.po
index af665f0411..b798d43f68 100644
--- a/bacula/po/de.po
+++ b/bacula/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-07-04 16:22+0200\n"
+"POT-Creation-Date: 2008-07-07 23:08+0200\n"
 "PO-Revision-Date: 2007-06-25 20:38+0200\n"
 "Last-Translator: Philipp Storz <philipp.storz@dass-it.de>\n"
 "Language-Team: \n"
@@ -7858,7 +7858,7 @@ msgstr ""
 msgid "End Session"
 msgstr ""
 
-#: src/stored/read_record.c:407 src/stored/label.c:1049
+#: src/stored/read_record.c:407 src/stored/label.c:1053
 msgid "End of Media"
 msgstr ""
 
@@ -7901,26 +7901,26 @@ msgstr ""
 msgid "Unable to initialize volume list lock. ERR=%s\n"
 msgstr "Kann DB lock nicht initialisieren. ERR=%s\n"
 
-#: src/stored/reserve.c:444
+#: src/stored/reserve.c:442
 #, c-format
 msgid "Device switch. New device %s chosen.\n"
 msgstr ""
 
-#: src/stored/reserve.c:511
+#: src/stored/reserve.c:509
 #, c-format
 msgid "Hey! num_writers=%d!!!!\n"
 msgstr ""
 
-#: src/stored/reserve.c:763
+#: src/stored/reserve.c:752
 msgid "3939 Could not get dcr\n"
 msgstr ""
 
-#: src/stored/reserve.c:866 src/stored/reserve.c:877
+#: src/stored/reserve.c:855 src/stored/reserve.c:866
 #, c-format
 msgid "Failed command: %s\n"
 msgstr ""
 
-#: src/stored/reserve.c:867
+#: src/stored/reserve.c:856
 #, c-format
 msgid ""
 "\n"
@@ -7928,7 +7928,7 @@ msgid ""
 "Device resources.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1183 src/stored/dircmd.c:601
+#: src/stored/reserve.c:1172 src/stored/dircmd.c:601
 #, c-format
 msgid ""
 "\n"
@@ -7936,80 +7936,80 @@ msgid ""
 "does not exist.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1187 src/stored/dircmd.c:579
+#: src/stored/reserve.c:1176 src/stored/dircmd.c:579
 #, c-format
 msgid ""
 "\n"
 "     Device \"%s\" requested by DIR could not be opened or does not exist.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1199
+#: src/stored/reserve.c:1188
 #, c-format
 msgid "3926 Could not get dcr for device: %s\n"
 msgstr ""
 
-#: src/stored/reserve.c:1322
+#: src/stored/reserve.c:1311
 #, c-format
 msgid "3601 JobId=%u device %s is BLOCKED due to user unmount.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1332
+#: src/stored/reserve.c:1321
 #, c-format
 msgid "3602 JobId=%u device %s is busy (already reading/writing).\n"
 msgstr ""
 
-#: src/stored/reserve.c:1376
+#: src/stored/reserve.c:1365
 #, c-format
 msgid "3603 JobId=%u device %s is busy reading.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1385
+#: src/stored/reserve.c:1374
 #, c-format
 msgid "3604 JobId=%u device %s is BLOCKED due to user unmount.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1422
+#: src/stored/reserve.c:1411
 #, c-format
 msgid ""
 "3608 JobId=%u wants Pool=\"%s\" but have Pool=\"%s\" nreserve=%d on drive %"
 "s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1448
+#: src/stored/reserve.c:1437
 #, c-format
 msgid "3610 JobId=%u Volume max jobs exceeded on drive %s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1503
+#: src/stored/reserve.c:1492
 #, c-format
 msgid "3605 JobId=%u wants free drive but device %s is busy.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1511
+#: src/stored/reserve.c:1500
 #, c-format
 msgid "3606 JobId=%u prefers mounted drives, but drive %s has no Volume.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1534
+#: src/stored/reserve.c:1523
 #, c-format
 msgid "3607 JobId=%u wants Vol=\"%s\" drive has Vol=\"%s\" on drive %s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1590
+#: src/stored/reserve.c:1579
 #, c-format
 msgid "Logic error!!!! JobId=%u Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1591
+#: src/stored/reserve.c:1580
 #, c-format
 msgid "3910 JobId=%u Logic error!!!! drive %s Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1594
+#: src/stored/reserve.c:1583
 msgid "Logic error!!!! Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1597
+#: src/stored/reserve.c:1586
 #, c-format
 msgid "3911 JobId=%u failed reserve drive %s.\n"
 msgstr ""
@@ -8093,11 +8093,11 @@ msgstr ""
 msgid "EOT label not copied.\n"
 msgstr ""
 
-#: src/stored/bcopy.c:319 src/stored/label.c:1043 src/stored/bls.c:423
+#: src/stored/bcopy.c:319 src/stored/label.c:1047 src/stored/bls.c:423
 msgid "Begin Job Session"
 msgstr ""
 
-#: src/stored/bcopy.c:323 src/stored/label.c:1046 src/stored/bls.c:427
+#: src/stored/bcopy.c:323 src/stored/label.c:1050 src/stored/bls.c:427
 msgid "End Job Session"
 msgstr ""
 
@@ -8105,7 +8105,7 @@ msgstr ""
 msgid "End of Medium"
 msgstr ""
 
-#: src/stored/bcopy.c:331 src/stored/label.c:1055 src/stored/bls.c:434
+#: src/stored/bcopy.c:331 src/stored/label.c:1059 src/stored/bls.c:434
 msgid "Unknown"
 msgstr ""
 
@@ -8306,7 +8306,7 @@ msgstr ""
 msgid "Volume on %s has bad Bacula label type: %x\n"
 msgstr ""
 
-#: src/stored/label.c:259 src/stored/label.c:416 src/stored/mount.c:429
+#: src/stored/label.c:259 src/stored/label.c:420 src/stored/mount.c:435
 #: src/stored/acquire.c:180
 #, fuzzy, c-format
 msgid "Could not reserve volume %s on %s\n"
@@ -8317,57 +8317,57 @@ msgstr "Konnte FileSet \"%s\" Eintrag nicht erzeugen. ERR=%s\n"
 msgid "Cannot write Volume label to block for device %s\n"
 msgstr ""
 
-#: src/stored/label.c:346 src/stored/label.c:444
+#: src/stored/label.c:350 src/stored/label.c:448
 #, fuzzy, c-format
 msgid "Open device %s Volume \"%s\" failed: ERR=%s\n"
 msgstr "Erzeugung von db Device Eintrag %s fehlgeschlagen: ERR=%s\n"
 
-#: src/stored/label.c:468
+#: src/stored/label.c:472
 #, c-format
 msgid "Rewind error on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:476
+#: src/stored/label.c:480
 #, c-format
 msgid "Truncate error on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:482
+#: src/stored/label.c:486
 #, c-format
 msgid "Failed to re-open DVD after truncate on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:505
+#: src/stored/label.c:509
 #, c-format
 msgid "Unable to write device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:534
+#: src/stored/label.c:538
 #, c-format
 msgid "Recycled volume \"%s\" on device %s, all previous data lost.\n"
 msgstr ""
 
-#: src/stored/label.c:537
+#: src/stored/label.c:541
 #, c-format
 msgid "Wrote label to prelabeled Volume \"%s\" on device %s\n"
 msgstr ""
 
-#: src/stored/label.c:736
+#: src/stored/label.c:740
 #, c-format
 msgid "Bad Volume session label = %d\n"
 msgstr ""
 
-#: src/stored/label.c:791
+#: src/stored/label.c:795
 #, c-format
 msgid "Expecting Volume Label, got FI=%s Stream=%s len=%d\n"
 msgstr ""
 
-#: src/stored/label.c:918
+#: src/stored/label.c:922
 #, c-format
 msgid "Unknown %d"
 msgstr ""
 
-#: src/stored/label.c:922
+#: src/stored/label.c:926
 #, c-format
 msgid ""
 "\n"
@@ -8384,17 +8384,17 @@ msgid ""
 "HostName          : %s\n"
 msgstr ""
 
-#: src/stored/label.c:944
+#: src/stored/label.c:948
 #, c-format
 msgid "Date label written: %s\n"
 msgstr ""
 
-#: src/stored/label.c:950
+#: src/stored/label.c:954
 #, c-format
 msgid "Date label written: %04d-%02d-%02d at %02d:%02d\n"
 msgstr ""
 
-#: src/stored/label.c:970
+#: src/stored/label.c:974
 #, c-format
 msgid ""
 "\n"
@@ -8407,7 +8407,7 @@ msgid ""
 "ClientName        : %s\n"
 msgstr ""
 
-#: src/stored/label.c:983
+#: src/stored/label.c:987
 #, c-format
 msgid ""
 "Job (unique name) : %s\n"
@@ -8416,7 +8416,7 @@ msgid ""
 "JobLevel          : %c\n"
 msgstr ""
 
-#: src/stored/label.c:992
+#: src/stored/label.c:996
 #, c-format
 msgid ""
 "JobFiles          : %s\n"
@@ -8429,48 +8429,48 @@ msgid ""
 "JobStatus         : %c\n"
 msgstr ""
 
-#: src/stored/label.c:1013
+#: src/stored/label.c:1017
 #, c-format
 msgid "Date written      : %s\n"
 msgstr ""
 
-#: src/stored/label.c:1018
+#: src/stored/label.c:1022
 #, c-format
 msgid "Date written      : %04d-%02d-%02d at %02d:%02d\n"
 msgstr ""
 
-#: src/stored/label.c:1037
+#: src/stored/label.c:1041
 msgid "Fresh Volume"
 msgstr ""
 
-#: src/stored/label.c:1040
+#: src/stored/label.c:1044
 msgid "Volume"
 msgstr ""
 
-#: src/stored/label.c:1052
+#: src/stored/label.c:1056
 msgid "End of Tape"
 msgstr ""
 
-#: src/stored/label.c:1072 src/stored/label.c:1080 src/stored/label.c:1113
+#: src/stored/label.c:1076 src/stored/label.c:1084 src/stored/label.c:1117
 #, c-format
 msgid "%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d DataLen=%d\n"
 msgstr ""
 
-#: src/stored/label.c:1077
+#: src/stored/label.c:1081
 msgid "End of physical tape.\n"
 msgstr ""
 
-#: src/stored/label.c:1092 src/stored/label.c:1101
+#: src/stored/label.c:1096 src/stored/label.c:1105
 #, c-format
 msgid "%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d\n"
 msgstr ""
 
-#: src/stored/label.c:1094
+#: src/stored/label.c:1098
 #, c-format
 msgid "   Job=%s Date=%s Level=%c Type=%c\n"
 msgstr ""
 
-#: src/stored/label.c:1103
+#: src/stored/label.c:1107
 #, c-format
 msgid "   Date=%s Level=%c Type=%c Files=%s Bytes=%s Errors=%d Status=%c\n"
 msgstr ""
@@ -10602,7 +10602,7 @@ msgstr ""
 msgid "Read block=%u, VolBytes=%s rate=%.1f KB/s\n"
 msgstr ""
 
-#: src/stored/btape.c:2757 src/stored/mount.c:785
+#: src/stored/btape.c:2757 src/stored/mount.c:791
 #, c-format
 msgid "Cannot open Dev=%s, Vol=%s\n"
 msgstr ""
@@ -10791,32 +10791,32 @@ msgstr ""
 msgid "Error updating file attributes. ERR=%s\n"
 msgstr ""
 
-#: src/stored/mount.c:94
+#: src/stored/mount.c:95
 #, c-format
 msgid "Too many errors trying to mount device %s.\n"
 msgstr ""
 
-#: src/stored/mount.c:102
+#: src/stored/mount.c:103
 #, c-format
 msgid "Job %d canceled.\n"
 msgstr ""
 
-#: src/stored/mount.c:260
+#: src/stored/mount.c:266
 #, c-format
 msgid "Volume \"%s\" previously written, moving to end of data.\n"
 msgstr ""
 
-#: src/stored/mount.c:264
+#: src/stored/mount.c:270
 #, c-format
 msgid "Unable to position to end of data on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/mount.c:377 src/stored/mount.c:649
+#: src/stored/mount.c:383 src/stored/mount.c:655
 #, c-format
 msgid "Volume \"%s\" not on device %s.\n"
 msgstr ""
 
-#: src/stored/mount.c:410
+#: src/stored/mount.c:416
 #, c-format
 msgid ""
 "Director wanted Volume \"%s\".\n"
@@ -10824,69 +10824,69 @@ msgid ""
 "    %s"
 msgstr ""
 
-#: src/stored/mount.c:543
+#: src/stored/mount.c:548
 #, c-format
 msgid "Ready to append to end of Volume \"%s\" part=%d size=%s\n"
 msgstr ""
 
-#: src/stored/mount.c:547
+#: src/stored/mount.c:552
 #, c-format
 msgid ""
 "Bacula cannot write on DVD Volume \"%s\" because: The sizes do not match! "
 "Volume=%s Catalog=%s\n"
 msgstr ""
 
-#: src/stored/mount.c:561
+#: src/stored/mount.c:566
 #, c-format
 msgid "Ready to append to end of Volume \"%s\" at file=%d.\n"
 msgstr ""
 
-#: src/stored/mount.c:564
+#: src/stored/mount.c:569
 #, c-format
 msgid ""
 "Bacula cannot write on tape Volume \"%s\" because:\n"
 "The number of files mismatch! Volume=%u Catalog=%u\n"
 msgstr ""
 
-#: src/stored/mount.c:575
+#: src/stored/mount.c:580
 #, c-format
 msgid "Ready to append to end of Volume \"%s\" size=%s\n"
 msgstr ""
 
-#: src/stored/mount.c:579
+#: src/stored/mount.c:584
 #, c-format
 msgid ""
 "Bacula cannot write on disk Volume \"%s\" because: The sizes do not match! "
 "Volume=%s Catalog=%s\n"
 msgstr ""
 
-#: src/stored/mount.c:639
+#: src/stored/mount.c:645
 #, c-format
 msgid "Labeled new Volume \"%s\" on device %s.\n"
 msgstr ""
 
-#: src/stored/mount.c:644
+#: src/stored/mount.c:650
 #, fuzzy, c-format
 msgid "Device %s not configured to autolabel Volumes.\n"
 msgstr "TLS benötigt aber nicht konfiguriert in Bacula.\n"
 
-#: src/stored/mount.c:663
+#: src/stored/mount.c:669
 #, c-format
 msgid "Marking Volume \"%s\" in Error in Catalog.\n"
 msgstr ""
 
-#: src/stored/mount.c:680
+#: src/stored/mount.c:686
 #, c-format
 msgid ""
 "Autochanger Volume \"%s\" not found in slot %d.\n"
 "    Setting InChanger to zero in catalog.\n"
 msgstr ""
 
-#: src/stored/mount.c:699
+#: src/stored/mount.c:705
 msgid "Hey!!!!! WroteVol non-zero !!!!!\n"
 msgstr ""
 
-#: src/stored/mount.c:748
+#: src/stored/mount.c:754
 #, c-format
 msgid ""
 "Invalid tape position on volume \"%s\" on device %s. Expected %d, got %d\n"
diff --git a/bacula/po/fr.po b/bacula/po/fr.po
index c4c90628d5..5a23114fdc 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: 2008-07-04 16:22+0200\n"
+"POT-Creation-Date: 2008-07-07 23:08+0200\n"
 "PO-Revision-Date: 2008-01-24 22:54+0100\n"
 "Last-Translator: Eric Bollengier <eric@eb.homelinux.org>\n"
 "Language-Team: French <bacula-devel-fr@lists.sourceforge.net>\n"
@@ -8081,7 +8081,7 @@ msgstr ""
 msgid "End Session"
 msgstr ""
 
-#: src/stored/read_record.c:407 src/stored/label.c:1049
+#: src/stored/read_record.c:407 src/stored/label.c:1053
 msgid "End of Media"
 msgstr ""
 
@@ -8124,27 +8124,27 @@ msgstr "Impossible d'initialiser le verrou sur la base. ERR=%s\n"
 msgid "Unable to initialize volume list lock. ERR=%s\n"
 msgstr "Impossible d'initialiser le verrou sur la base. ERR=%s\n"
 
-#: src/stored/reserve.c:444
+#: src/stored/reserve.c:442
 #, c-format
 msgid "Device switch. New device %s chosen.\n"
 msgstr ""
 
-#: src/stored/reserve.c:511
+#: src/stored/reserve.c:509
 #, c-format
 msgid "Hey! num_writers=%d!!!!\n"
 msgstr ""
 
-#: src/stored/reserve.c:763
+#: src/stored/reserve.c:752
 #, fuzzy
 msgid "3939 Could not get dcr\n"
 msgstr "Impossible de créer la structure BSOCK cliente.\n"
 
-#: src/stored/reserve.c:866 src/stored/reserve.c:877
+#: src/stored/reserve.c:855 src/stored/reserve.c:866
 #, c-format
 msgid "Failed command: %s\n"
 msgstr "Erreur sur la commande : %s\n"
 
-#: src/stored/reserve.c:867
+#: src/stored/reserve.c:856
 #, c-format
 msgid ""
 "\n"
@@ -8152,7 +8152,7 @@ msgid ""
 "Device resources.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1183 src/stored/dircmd.c:601
+#: src/stored/reserve.c:1172 src/stored/dircmd.c:601
 #, c-format
 msgid ""
 "\n"
@@ -8160,42 +8160,42 @@ msgid ""
 "does not exist.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1187 src/stored/dircmd.c:579
+#: src/stored/reserve.c:1176 src/stored/dircmd.c:579
 #, c-format
 msgid ""
 "\n"
 "     Device \"%s\" requested by DIR could not be opened or does not exist.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1199
+#: src/stored/reserve.c:1188
 #, c-format
 msgid "3926 Could not get dcr for device: %s\n"
 msgstr ""
 
-#: src/stored/reserve.c:1322
+#: src/stored/reserve.c:1311
 #, c-format
 msgid "3601 JobId=%u device %s is BLOCKED due to user unmount.\n"
 msgstr ""
 "3601 JobId=%u device %s est BLOQUÉ car il a été demonté par l'utilisateur.\n"
 
-#: src/stored/reserve.c:1332
+#: src/stored/reserve.c:1321
 #, c-format
 msgid "3602 JobId=%u device %s is busy (already reading/writing).\n"
 msgstr "3602 JobId=%u device %s est occupé (à lire ou écrire).\n"
 
-#: src/stored/reserve.c:1376
+#: src/stored/reserve.c:1365
 #, c-format
 msgid "3603 JobId=%u device %s is busy reading.\n"
 msgstr "3603 JobId=%u device %s est occupé en lecture.\n"
 
-#: src/stored/reserve.c:1385
+#: src/stored/reserve.c:1374
 #, c-format
 msgid "3604 JobId=%u device %s is BLOCKED due to user unmount.\n"
 msgstr ""
 "3604 JobId=%u device %s est bloqué car il a été démonté par l'utilisateur "
 "(unmount).\n"
 
-#: src/stored/reserve.c:1422
+#: src/stored/reserve.c:1411
 #, fuzzy, c-format
 msgid ""
 "3608 JobId=%u wants Pool=\"%s\" but have Pool=\"%s\" nreserve=%d on drive %"
@@ -8204,46 +8204,46 @@ msgstr ""
 "3608 JobId=%u voulait le Pool=« %s », mais c'est le Pool=« %s » qui est dans "
 "le drive %s.\n"
 
-#: src/stored/reserve.c:1448
+#: src/stored/reserve.c:1437
 #, fuzzy, c-format
 msgid "3610 JobId=%u Volume max jobs exceeded on drive %s.\n"
 msgstr ""
 "3607 JobId=%u voulait Vol=« %s », c'est le Vol=« %s » qui est dans le drive %"
 "s.\n"
 
-#: src/stored/reserve.c:1503
+#: src/stored/reserve.c:1492
 #, c-format
 msgid "3605 JobId=%u wants free drive but device %s is busy.\n"
 msgstr ""
 "3605 JobId=%u voulait libérer le lecteur, mais le device %s est occupé.\n"
 
-#: src/stored/reserve.c:1511
+#: src/stored/reserve.c:1500
 #, c-format
 msgid "3606 JobId=%u prefers mounted drives, but drive %s has no Volume.\n"
 msgstr "3606 JobId=%u voulait un lecteur monté, mais le lecteur %s est vide.\n"
 
-#: src/stored/reserve.c:1534
+#: src/stored/reserve.c:1523
 #, c-format
 msgid "3607 JobId=%u wants Vol=\"%s\" drive has Vol=\"%s\" on drive %s.\n"
 msgstr ""
 "3607 JobId=%u voulait Vol=« %s », c'est le Vol=« %s » qui est dans le drive %"
 "s.\n"
 
-#: src/stored/reserve.c:1590
+#: src/stored/reserve.c:1579
 #, c-format
 msgid "Logic error!!!! JobId=%u Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1591
+#: src/stored/reserve.c:1580
 #, c-format
 msgid "3910 JobId=%u Logic error!!!! drive %s Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1594
+#: src/stored/reserve.c:1583
 msgid "Logic error!!!! Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1597
+#: src/stored/reserve.c:1586
 #, c-format
 msgid "3911 JobId=%u failed reserve drive %s.\n"
 msgstr ""
@@ -8328,11 +8328,11 @@ msgstr ""
 msgid "EOT label not copied.\n"
 msgstr ""
 
-#: src/stored/bcopy.c:319 src/stored/label.c:1043 src/stored/bls.c:423
+#: src/stored/bcopy.c:319 src/stored/label.c:1047 src/stored/bls.c:423
 msgid "Begin Job Session"
 msgstr ""
 
-#: src/stored/bcopy.c:323 src/stored/label.c:1046 src/stored/bls.c:427
+#: src/stored/bcopy.c:323 src/stored/label.c:1050 src/stored/bls.c:427
 msgid "End Job Session"
 msgstr ""
 
@@ -8340,7 +8340,7 @@ msgstr ""
 msgid "End of Medium"
 msgstr ""
 
-#: src/stored/bcopy.c:331 src/stored/label.c:1055 src/stored/bls.c:434
+#: src/stored/bcopy.c:331 src/stored/label.c:1059 src/stored/bls.c:434
 msgid "Unknown"
 msgstr ""
 
@@ -8543,7 +8543,7 @@ msgstr ""
 msgid "Volume on %s has bad Bacula label type: %x\n"
 msgstr "Le volume sur %s possède un mauvais label Bacula : %x\n"
 
-#: src/stored/label.c:259 src/stored/label.c:416 src/stored/mount.c:429
+#: src/stored/label.c:259 src/stored/label.c:420 src/stored/mount.c:435
 #: src/stored/acquire.c:180
 #, fuzzy, c-format
 msgid "Could not reserve volume %s on %s\n"
@@ -8554,60 +8554,60 @@ msgstr "Impossible de trouver le prochain volume pour le Job %s.\n"
 msgid "Cannot write Volume label to block for device %s\n"
 msgstr "Impossible d'écrire le label du Volume sur le Device %s\n"
 
-#: src/stored/label.c:346 src/stored/label.c:444
+#: src/stored/label.c:350 src/stored/label.c:448
 #, fuzzy, c-format
 msgid "Open device %s Volume \"%s\" failed: ERR=%s\n"
 msgstr "Impossible de supprimer le volume « %s ». ERR=%s"
 
-#: src/stored/label.c:468
+#: src/stored/label.c:472
 #, c-format
 msgid "Rewind error on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:476
+#: src/stored/label.c:480
 #, c-format
 msgid "Truncate error on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:482
+#: src/stored/label.c:486
 #, fuzzy, c-format
 msgid "Failed to re-open DVD after truncate on device %s: ERR=%s\n"
 msgstr ""
 "Impossible de se positionner à la fin du média sur le device %s : ERR=%s\n"
 
-#: src/stored/label.c:505
+#: src/stored/label.c:509
 #, c-format
 msgid "Unable to write device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/label.c:534
+#: src/stored/label.c:538
 #, c-format
 msgid "Recycled volume \"%s\" on device %s, all previous data lost.\n"
 msgstr ""
 "Recyclage du volume « %s » sur le lecteur %s, les précédentes données sont "
 "perdues.\n"
 
-#: src/stored/label.c:537
+#: src/stored/label.c:541
 #, c-format
 msgid "Wrote label to prelabeled Volume \"%s\" on device %s\n"
 msgstr "Écriture du label sur le Volume pré-labélisé « %s » sur le lecteur %s\n"
 
-#: src/stored/label.c:736
+#: src/stored/label.c:740
 #, fuzzy, c-format
 msgid "Bad Volume session label = %d\n"
 msgstr "Le Volume n'a pas de label.\n"
 
-#: src/stored/label.c:791
+#: src/stored/label.c:795
 #, c-format
 msgid "Expecting Volume Label, got FI=%s Stream=%s len=%d\n"
 msgstr ""
 
-#: src/stored/label.c:918
+#: src/stored/label.c:922
 #, c-format
 msgid "Unknown %d"
 msgstr ""
 
-#: src/stored/label.c:922
+#: src/stored/label.c:926
 #, c-format
 msgid ""
 "\n"
@@ -8624,17 +8624,17 @@ msgid ""
 "HostName          : %s\n"
 msgstr ""
 
-#: src/stored/label.c:944
+#: src/stored/label.c:948
 #, c-format
 msgid "Date label written: %s\n"
 msgstr ""
 
-#: src/stored/label.c:950
+#: src/stored/label.c:954
 #, c-format
 msgid "Date label written: %04d-%02d-%02d at %02d:%02d\n"
 msgstr ""
 
-#: src/stored/label.c:970
+#: src/stored/label.c:974
 #, c-format
 msgid ""
 "\n"
@@ -8647,7 +8647,7 @@ msgid ""
 "ClientName        : %s\n"
 msgstr ""
 
-#: src/stored/label.c:983
+#: src/stored/label.c:987
 #, c-format
 msgid ""
 "Job (unique name) : %s\n"
@@ -8656,7 +8656,7 @@ msgid ""
 "JobLevel          : %c\n"
 msgstr ""
 
-#: src/stored/label.c:992
+#: src/stored/label.c:996
 #, c-format
 msgid ""
 "JobFiles          : %s\n"
@@ -8669,48 +8669,48 @@ msgid ""
 "JobStatus         : %c\n"
 msgstr ""
 
-#: src/stored/label.c:1013
+#: src/stored/label.c:1017
 #, c-format
 msgid "Date written      : %s\n"
 msgstr ""
 
-#: src/stored/label.c:1018
+#: src/stored/label.c:1022
 #, c-format
 msgid "Date written      : %04d-%02d-%02d at %02d:%02d\n"
 msgstr ""
 
-#: src/stored/label.c:1037
+#: src/stored/label.c:1041
 msgid "Fresh Volume"
 msgstr ""
 
-#: src/stored/label.c:1040
+#: src/stored/label.c:1044
 msgid "Volume"
 msgstr ""
 
-#: src/stored/label.c:1052
+#: src/stored/label.c:1056
 msgid "End of Tape"
 msgstr ""
 
-#: src/stored/label.c:1072 src/stored/label.c:1080 src/stored/label.c:1113
+#: src/stored/label.c:1076 src/stored/label.c:1084 src/stored/label.c:1117
 #, c-format
 msgid "%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d DataLen=%d\n"
 msgstr ""
 
-#: src/stored/label.c:1077
+#: src/stored/label.c:1081
 msgid "End of physical tape.\n"
 msgstr ""
 
-#: src/stored/label.c:1092 src/stored/label.c:1101
+#: src/stored/label.c:1096 src/stored/label.c:1105
 #, c-format
 msgid "%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d\n"
 msgstr ""
 
-#: src/stored/label.c:1094
+#: src/stored/label.c:1098
 #, c-format
 msgid "   Job=%s Date=%s Level=%c Type=%c\n"
 msgstr ""
 
-#: src/stored/label.c:1103
+#: src/stored/label.c:1107
 #, c-format
 msgid "   Date=%s Level=%c Type=%c Files=%s Bytes=%s Errors=%d Status=%c\n"
 msgstr ""
@@ -10893,7 +10893,7 @@ msgstr "Le volume 
 msgid "Read block=%u, VolBytes=%s rate=%.1f KB/s\n"
 msgstr ""
 
-#: src/stored/btape.c:2757 src/stored/mount.c:785
+#: src/stored/btape.c:2757 src/stored/mount.c:791
 #, c-format
 msgid "Cannot open Dev=%s, Vol=%s\n"
 msgstr ""
@@ -11091,33 +11091,33 @@ msgstr ""
 msgid "Error updating file attributes. ERR=%s\n"
 msgstr ""
 
-#: src/stored/mount.c:94
+#: src/stored/mount.c:95
 #, c-format
 msgid "Too many errors trying to mount device %s.\n"
 msgstr ""
 
-#: src/stored/mount.c:102
+#: src/stored/mount.c:103
 #, c-format
 msgid "Job %d canceled.\n"
 msgstr "Le job %d est annulé.\n"
 
-#: src/stored/mount.c:260
+#: src/stored/mount.c:266
 #, c-format
 msgid "Volume \"%s\" previously written, moving to end of data.\n"
 msgstr "Le volume « %s » contient des données, re-positionnement à la fin.\n"
 
-#: src/stored/mount.c:264
+#: src/stored/mount.c:270
 #, c-format
 msgid "Unable to position to end of data on device %s: ERR=%s\n"
 msgstr ""
 "Impossible de se positionner à la fin du média sur le device %s : ERR=%s\n"
 
-#: src/stored/mount.c:377 src/stored/mount.c:649
+#: src/stored/mount.c:383 src/stored/mount.c:655
 #, c-format
 msgid "Volume \"%s\" not on device %s.\n"
 msgstr "Le volume « %s » n'est pas dans le device %s.\n"
 
-#: src/stored/mount.c:410
+#: src/stored/mount.c:416
 #, c-format
 msgid ""
 "Director wanted Volume \"%s\".\n"
@@ -11128,14 +11128,14 @@ msgstr ""
 "    Le volume courant « %s » n'est pas utilisable car :\n"
 "    %s"
 
-#: src/stored/mount.c:543
+#: src/stored/mount.c:548
 #, c-format
 msgid "Ready to append to end of Volume \"%s\" part=%d size=%s\n"
 msgstr ""
 "Prêt à ajouter des données à la fin du volume « %s » part=%d size=%s\n"
 "\n"
 
-#: src/stored/mount.c:547
+#: src/stored/mount.c:552
 #, fuzzy, c-format
 msgid ""
 "Bacula cannot write on DVD Volume \"%s\" because: The sizes do not match! "
@@ -11144,12 +11144,12 @@ msgstr ""
 "Impossible d'écrire sur le volume « %s » car :\n"
 "Les tailles ne correspondent pas. Volume=%s Catalogue=%s\n"
 
-#: src/stored/mount.c:561
+#: src/stored/mount.c:566
 #, c-format
 msgid "Ready to append to end of Volume \"%s\" at file=%d.\n"
 msgstr "Prêt à ajouter des données à la fin du volume « %s » file=%d.\n"
 
-#: src/stored/mount.c:564
+#: src/stored/mount.c:569
 #, fuzzy, c-format
 msgid ""
 "Bacula cannot write on tape Volume \"%s\" because:\n"
@@ -11158,12 +11158,12 @@ msgstr ""
 "Impossible d'écrire sur le volume « %s » \n"
 "car le nombre de fichiers ne correspond pas. Volume=%u Catalogue=%u\n"
 
-#: src/stored/mount.c:575
+#: src/stored/mount.c:580
 #, c-format
 msgid "Ready to append to end of Volume \"%s\" size=%s\n"
 msgstr "Prêt à ajouter des données à la fin du volume « %s » size=%s\n"
 
-#: src/stored/mount.c:579
+#: src/stored/mount.c:584
 #, c-format
 msgid ""
 "Bacula cannot write on disk Volume \"%s\" because: The sizes do not match! "
@@ -11172,35 +11172,35 @@ msgstr ""
 "Impossible d'écrire sur le volume « %s » car : Les tailles ne correspondent "
 "pas. Volume=%s Catalogue=%s\n"
 
-#: src/stored/mount.c:639
+#: src/stored/mount.c:645
 #, c-format
 msgid "Labeled new Volume \"%s\" on device %s.\n"
 msgstr "Le nouveau volume « %s » a été labélisé sur le device %s.\n"
 
-#: src/stored/mount.c:644
+#: src/stored/mount.c:650
 #, c-format
 msgid "Device %s not configured to autolabel Volumes.\n"
 msgstr ""
 "Attention, le device %s n'est pas configuré pour labéliser automatiquement "
 "les volumes.\n"
 
-#: src/stored/mount.c:663
+#: src/stored/mount.c:669
 #, c-format
 msgid "Marking Volume \"%s\" in Error in Catalog.\n"
 msgstr "Le volume « %s » est marqué en Erreur dans le catalogue.\n"
 
-#: src/stored/mount.c:680
+#: src/stored/mount.c:686
 #, c-format
 msgid ""
 "Autochanger Volume \"%s\" not found in slot %d.\n"
 "    Setting InChanger to zero in catalog.\n"
 msgstr ""
 
-#: src/stored/mount.c:699
+#: src/stored/mount.c:705
 msgid "Hey!!!!! WroteVol non-zero !!!!!\n"
 msgstr ""
 
-#: src/stored/mount.c:748
+#: src/stored/mount.c:754
 #, fuzzy, c-format
 msgid ""
 "Invalid tape position on volume \"%s\" on device %s. Expected %d, got %d\n"
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 5997ad3148..2ed7b23ea5 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -46,7 +46,7 @@
 #define TRACE_FILE 1
 
 /* If this is set stdout will not be closed on startup */
-#define DEVELOPER 1
+/* #define DEVELOPER 1 */
 
 /*
  * SMCHECK does orphaned buffer checking (memory leaks)
diff --git a/bacula/technotes-2.4 b/bacula/technotes-2.4
index fc35bb86cc..49e8ddeaf5 100644
--- a/bacula/technotes-2.4
+++ b/bacula/technotes-2.4
@@ -2,6 +2,7 @@
 
 General:
 
+Release Version 2.4.1
 07Jul08
 kes  Clear in-use bit on vol when unused while swapping.
 06Jul08