From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 20 Dec 2006 22:53:34 +0000 (+0000)
Subject: Final changes
X-Git-Tag: Release-7.0.0~7197
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3dd4b9766dd2517f21d0201182d54cc937ae686e;p=bacula%2Fbacula

Final changes


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3836 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index fcc4b88c51..2d668a37a0 100644
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -4,6 +4,7 @@ General:
 
 Version 1.39.32 released: 
 20Dec06
+kes  Take first catalog if gui is set, or if using dotcmd.
 kes  Fix a couple of compiler warnings in wx-console
 kes  Apply the immutable patch for FreeBSD hardlinked files supplied
      by Olivier Lehmann.
diff --git a/bacula/po/bacula.pot b/bacula/po/bacula.pot
index e45faba16f..72f54111dc 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: 2006-12-20 15:07+0100\n"
+"POT-Creation-Date: 2006-12-20 23:53+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1232,7 +1232,7 @@ msgid "%s: name=%s JobType=%d level=%s Priority=%d Enabled=%d\n"
 msgstr ""
 
 #: src/dird/dird_conf.c:584 src/dird/ua_cmds.c:455 src/dird/ua_prune.c:427
-#: src/dird/ua_run.c:576 src/dird/ua_select.c:250 src/dird/ua_select.c:273
+#: src/dird/ua_run.c:576 src/dird/ua_select.c:263 src/dird/ua_select.c:286
 msgid "Job"
 msgstr ""
 
@@ -2903,8 +2903,8 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: src/dird/ua_cmds.c:907 src/dird/ua_run.c:578 src/dird/ua_select.c:298
-#: src/dird/ua_select.c:407 src/wx-console/wxbrestorepanel.cpp:335
+#: src/dird/ua_cmds.c:907 src/dird/ua_run.c:578 src/dird/ua_select.c:311
+#: src/dird/ua_select.c:420 src/wx-console/wxbrestorepanel.cpp:335
 #: src/wx-console/wxbrestorepanel.cpp:353
 #: src/wx-console/wxbrestorepanel.cpp:430
 #: src/wx-console/wxbrestorepanel.cpp:431
@@ -3018,7 +3018,7 @@ msgstr ""
 msgid "%s Version: %s (%s)\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1617
+#: src/dird/ua_cmds.c:1617 src/dird/ua_select.c:221
 msgid "Could not find a Catalog resource\n"
 msgstr ""
 
@@ -3027,15 +3027,15 @@ msgstr ""
 msgid "Could not open catalog database \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:118 src/console/console.c:203
+#: src/dird/ua_dotcmds.c:121 src/console/console.c:203
 msgid ": is an invalid command\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:141
+#: src/dird/ua_dotcmds.c:144
 msgid "The Director will segment fault.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:255 src/dird/ua_restore.c:758
+#: src/dird/ua_dotcmds.c:259 src/dird/ua_restore.c:758
 #: src/dird/ua_restore.c:786 src/dird/ua_restore.c:807
 #, c-format
 msgid "Query failed: %s. ERR=%s\n"
@@ -3294,7 +3294,7 @@ msgstr ""
 msgid "No Pool specified.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:405 src/dird/ua_select.c:474
+#: src/dird/ua_output.c:405 src/dird/ua_select.c:487
 #, c-format
 msgid "Error obtaining pool ids. ERR=%s\n"
 msgstr ""
@@ -3608,7 +3608,7 @@ msgstr ""
 msgid "Improper date format: %s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:424 src/dird/ua_select.c:606
+#: src/dird/ua_restore.c:424 src/dird/ua_select.c:619
 #, c-format
 msgid "Error: Pool resource \"%s\" does not exist.\n"
 msgstr ""
@@ -4034,7 +4034,7 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: src/dird/ua_run.c:584 src/dird/ua_select.c:492 src/dird/ua_select.c:582
+#: src/dird/ua_run.c:584 src/dird/ua_select.c:505 src/dird/ua_select.c:595
 #: src/dird/ua_update.c:413 src/dird/ua_update.c:492
 #: src/wx-console/wxbrestorepanel.cpp:337
 #: src/wx-console/wxbrestorepanel.cpp:526
@@ -4327,196 +4327,200 @@ msgstr ""
 msgid "Select Storage resource"
 msgstr ""
 
-#: src/dird/ua_select.c:217
+#: src/dird/ua_select.c:224
+msgid "You must specify a \"use <catalog-name>\" command before continuing.\n"
+msgstr ""
+
+#: src/dird/ua_select.c:230
 msgid "The defined Catalog resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:225
+#: src/dird/ua_select.c:238
 msgid "Catalog"
 msgstr ""
 
-#: src/dird/ua_select.c:225
+#: src/dird/ua_select.c:238
 msgid "Select Catalog resource"
 msgstr ""
 
-#: src/dird/ua_select.c:242
+#: src/dird/ua_select.c:255
 msgid "The defined Job resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:250
+#: src/dird/ua_select.c:263
 msgid "Select Job resource"
 msgstr ""
 
-#: src/dird/ua_select.c:265
+#: src/dird/ua_select.c:278
 msgid "The defined Restore Job resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:273
+#: src/dird/ua_select.c:286
 msgid "Select Restore Job"
 msgstr ""
 
-#: src/dird/ua_select.c:290
+#: src/dird/ua_select.c:303
 msgid "The defined Client resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:298
+#: src/dird/ua_select.c:311
 msgid "Select Client (File daemon) resource"
 msgstr ""
 
-#: src/dird/ua_select.c:325
+#: src/dird/ua_select.c:338
 #, c-format
 msgid "Error: Client resource %s does not exist.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:350
+#: src/dird/ua_select.c:363
 #, c-format
 msgid "Could not find Client %s: ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:360 src/dird/ua_select.c:414
+#: src/dird/ua_select.c:373 src/dird/ua_select.c:427
 #, c-format
 msgid "Could not find Client \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:389
+#: src/dird/ua_select.c:402
 #, c-format
 msgid "Error obtaining client ids. ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:393
+#: src/dird/ua_select.c:406
 msgid "No clients defined. You must run a job before using this command.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:397
+#: src/dird/ua_select.c:410
 msgid "Defined Clients:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:407
+#: src/dird/ua_select.c:420
 msgid "Select the Client"
 msgstr ""
 
-#: src/dird/ua_select.c:440 src/dird/ua_select.c:463 src/dird/ua_select.c:499
+#: src/dird/ua_select.c:453 src/dird/ua_select.c:476 src/dird/ua_select.c:512
 #, c-format
 msgid "Could not find Pool \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:478
+#: src/dird/ua_select.c:491
 msgid "No pools defined. Use the \"create\" command to create one.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:482
+#: src/dird/ua_select.c:495
 msgid "Defined Pools:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:492
+#: src/dird/ua_select.c:505
 msgid "Select the Pool"
 msgstr ""
 
-#: src/dird/ua_select.c:522
+#: src/dird/ua_select.c:535
 #, c-format
 msgid "No access to Pool \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_select.c:548
+#: src/dird/ua_select.c:561
 msgid "Enter MediaId or Volume name: "
 msgstr ""
 
-#: src/dird/ua_select.c:574
+#: src/dird/ua_select.c:587
 msgid "The defined Pool resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:582
+#: src/dird/ua_select.c:595
 msgid "Select Pool resource"
 msgstr ""
 
-#: src/dird/ua_select.c:617
+#: src/dird/ua_select.c:630
 msgid "Enter the JobId to select: "
 msgstr ""
 
-#: src/dird/ua_select.c:655
+#: src/dird/ua_select.c:668
 #, c-format
 msgid "Could not find Job \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:733
+#: src/dird/ua_select.c:746
 #, c-format
 msgid "Automatically selected %s: %s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:738
+#: src/dird/ua_select.c:751
 #, c-format
 msgid "Cannot select %s in batch mode.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:752
+#: src/dird/ua_select.c:765
 #, c-format
 msgid "Selection list for \"%s\" is empty!\n"
 msgstr ""
 
-#: src/dird/ua_select.c:758
+#: src/dird/ua_select.c:771
 msgid "Item 1 selected automatically.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:769
+#: src/dird/ua_select.c:782
 msgid "Selection aborted, nothing done.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:774
+#: src/dird/ua_select.c:787
 #, c-format
 msgid "Please enter a number between 1 and %d\n"
 msgstr ""
 
-#: src/dird/ua_select.c:823
+#: src/dird/ua_select.c:836
 msgid "Storage name given twice.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:840
+#: src/dird/ua_select.c:853
 #, c-format
 msgid "Expecting jobid=nn command, got: %s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:844
+#: src/dird/ua_select.c:857
 #, c-format
 msgid "JobId %s is not running.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:854
+#: src/dird/ua_select.c:867
 #, c-format
 msgid "Expecting job=xxx, got: %s.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:858 src/dird/ua_select.c:870
+#: src/dird/ua_select.c:871 src/dird/ua_select.c:883
 #, c-format
 msgid "Job \"%s\" is not running.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:866
+#: src/dird/ua_select.c:879
 #, c-format
 msgid "Expecting ujobid=xxx, got: %s.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:886
+#: src/dird/ua_select.c:899
 #, c-format
 msgid "Storage resource \"%s\": not found\n"
 msgstr ""
 
-#: src/dird/ua_select.c:918
+#: src/dird/ua_select.c:931
 msgid "Enter autochanger drive[0]: "
 msgstr ""
 
-#: src/dird/ua_select.c:939
+#: src/dird/ua_select.c:952
 msgid "Enter autochanger slot: "
 msgstr ""
 
-#: src/dird/ua_select.c:969
+#: src/dird/ua_select.c:982
 msgid "Media Types defined in conf file:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:975
+#: src/dird/ua_select.c:988
 msgid "Media Type"
 msgstr ""
 
-#: src/dird/ua_select.c:975
+#: src/dird/ua_select.c:988
 msgid "Select the Media Type"
 msgstr ""
 
diff --git a/bacula/po/de.gmo b/bacula/po/de.gmo
index 1ad4ef9ba7..e492ae9622 100644
Binary files a/bacula/po/de.gmo and b/bacula/po/de.gmo differ
diff --git a/bacula/po/de.po b/bacula/po/de.po
index aab448874a..220dbefeea 100644
--- a/bacula/po/de.po
+++ b/bacula/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Bacula 1.38\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-12-20 15:07+0100\n"
+"POT-Creation-Date: 2006-12-20 23:53+0100\n"
 "PO-Revision-Date: 2005-08-11 14:05+0200\n"
 "Last-Translator:  <bacula-devel@lists.sourceforge.net\n"
 "Language-Team: German <bacula-devel@lists.sourceforge.net>\n"
@@ -1233,7 +1233,7 @@ msgid "%s: name=%s JobType=%d level=%s Priority=%d Enabled=%d\n"
 msgstr ""
 
 #: src/dird/dird_conf.c:584 src/dird/ua_cmds.c:455 src/dird/ua_prune.c:427
-#: src/dird/ua_run.c:576 src/dird/ua_select.c:250 src/dird/ua_select.c:273
+#: src/dird/ua_run.c:576 src/dird/ua_select.c:263 src/dird/ua_select.c:286
 msgid "Job"
 msgstr ""
 
@@ -2904,8 +2904,8 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: src/dird/ua_cmds.c:907 src/dird/ua_run.c:578 src/dird/ua_select.c:298
-#: src/dird/ua_select.c:407 src/wx-console/wxbrestorepanel.cpp:335
+#: src/dird/ua_cmds.c:907 src/dird/ua_run.c:578 src/dird/ua_select.c:311
+#: src/dird/ua_select.c:420 src/wx-console/wxbrestorepanel.cpp:335
 #: src/wx-console/wxbrestorepanel.cpp:353
 #: src/wx-console/wxbrestorepanel.cpp:430
 #: src/wx-console/wxbrestorepanel.cpp:431
@@ -3019,7 +3019,7 @@ msgstr ""
 msgid "%s Version: %s (%s)\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1617
+#: src/dird/ua_cmds.c:1617 src/dird/ua_select.c:221
 msgid "Could not find a Catalog resource\n"
 msgstr ""
 
@@ -3028,15 +3028,15 @@ msgstr ""
 msgid "Could not open catalog database \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:118 src/console/console.c:203
+#: src/dird/ua_dotcmds.c:121 src/console/console.c:203
 msgid ": is an invalid command\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:141
+#: src/dird/ua_dotcmds.c:144
 msgid "The Director will segment fault.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:255 src/dird/ua_restore.c:758
+#: src/dird/ua_dotcmds.c:259 src/dird/ua_restore.c:758
 #: src/dird/ua_restore.c:786 src/dird/ua_restore.c:807
 #, c-format
 msgid "Query failed: %s. ERR=%s\n"
@@ -3295,7 +3295,7 @@ msgstr ""
 msgid "No Pool specified.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:405 src/dird/ua_select.c:474
+#: src/dird/ua_output.c:405 src/dird/ua_select.c:487
 #, c-format
 msgid "Error obtaining pool ids. ERR=%s\n"
 msgstr ""
@@ -3609,7 +3609,7 @@ msgstr ""
 msgid "Improper date format: %s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:424 src/dird/ua_select.c:606
+#: src/dird/ua_restore.c:424 src/dird/ua_select.c:619
 #, c-format
 msgid "Error: Pool resource \"%s\" does not exist.\n"
 msgstr ""
@@ -4035,7 +4035,7 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: src/dird/ua_run.c:584 src/dird/ua_select.c:492 src/dird/ua_select.c:582
+#: src/dird/ua_run.c:584 src/dird/ua_select.c:505 src/dird/ua_select.c:595
 #: src/dird/ua_update.c:413 src/dird/ua_update.c:492
 #: src/wx-console/wxbrestorepanel.cpp:337
 #: src/wx-console/wxbrestorepanel.cpp:526
@@ -4328,196 +4328,200 @@ msgstr ""
 msgid "Select Storage resource"
 msgstr ""
 
-#: src/dird/ua_select.c:217
+#: src/dird/ua_select.c:224
+msgid "You must specify a \"use <catalog-name>\" command before continuing.\n"
+msgstr ""
+
+#: src/dird/ua_select.c:230
 msgid "The defined Catalog resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:225
+#: src/dird/ua_select.c:238
 msgid "Catalog"
 msgstr ""
 
-#: src/dird/ua_select.c:225
+#: src/dird/ua_select.c:238
 msgid "Select Catalog resource"
 msgstr ""
 
-#: src/dird/ua_select.c:242
+#: src/dird/ua_select.c:255
 msgid "The defined Job resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:250
+#: src/dird/ua_select.c:263
 msgid "Select Job resource"
 msgstr ""
 
-#: src/dird/ua_select.c:265
+#: src/dird/ua_select.c:278
 msgid "The defined Restore Job resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:273
+#: src/dird/ua_select.c:286
 msgid "Select Restore Job"
 msgstr ""
 
-#: src/dird/ua_select.c:290
+#: src/dird/ua_select.c:303
 msgid "The defined Client resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:298
+#: src/dird/ua_select.c:311
 msgid "Select Client (File daemon) resource"
 msgstr ""
 
-#: src/dird/ua_select.c:325
+#: src/dird/ua_select.c:338
 #, c-format
 msgid "Error: Client resource %s does not exist.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:350
+#: src/dird/ua_select.c:363
 #, c-format
 msgid "Could not find Client %s: ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:360 src/dird/ua_select.c:414
+#: src/dird/ua_select.c:373 src/dird/ua_select.c:427
 #, c-format
 msgid "Could not find Client \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:389
+#: src/dird/ua_select.c:402
 #, c-format
 msgid "Error obtaining client ids. ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:393
+#: src/dird/ua_select.c:406
 msgid "No clients defined. You must run a job before using this command.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:397
+#: src/dird/ua_select.c:410
 msgid "Defined Clients:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:407
+#: src/dird/ua_select.c:420
 msgid "Select the Client"
 msgstr ""
 
-#: src/dird/ua_select.c:440 src/dird/ua_select.c:463 src/dird/ua_select.c:499
+#: src/dird/ua_select.c:453 src/dird/ua_select.c:476 src/dird/ua_select.c:512
 #, c-format
 msgid "Could not find Pool \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:478
+#: src/dird/ua_select.c:491
 msgid "No pools defined. Use the \"create\" command to create one.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:482
+#: src/dird/ua_select.c:495
 msgid "Defined Pools:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:492
+#: src/dird/ua_select.c:505
 msgid "Select the Pool"
 msgstr ""
 
-#: src/dird/ua_select.c:522
+#: src/dird/ua_select.c:535
 #, c-format
 msgid "No access to Pool \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_select.c:548
+#: src/dird/ua_select.c:561
 msgid "Enter MediaId or Volume name: "
 msgstr ""
 
-#: src/dird/ua_select.c:574
+#: src/dird/ua_select.c:587
 msgid "The defined Pool resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:582
+#: src/dird/ua_select.c:595
 msgid "Select Pool resource"
 msgstr ""
 
-#: src/dird/ua_select.c:617
+#: src/dird/ua_select.c:630
 msgid "Enter the JobId to select: "
 msgstr ""
 
-#: src/dird/ua_select.c:655
+#: src/dird/ua_select.c:668
 #, c-format
 msgid "Could not find Job \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:733
+#: src/dird/ua_select.c:746
 #, c-format
 msgid "Automatically selected %s: %s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:738
+#: src/dird/ua_select.c:751
 #, c-format
 msgid "Cannot select %s in batch mode.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:752
+#: src/dird/ua_select.c:765
 #, c-format
 msgid "Selection list for \"%s\" is empty!\n"
 msgstr ""
 
-#: src/dird/ua_select.c:758
+#: src/dird/ua_select.c:771
 msgid "Item 1 selected automatically.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:769
+#: src/dird/ua_select.c:782
 msgid "Selection aborted, nothing done.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:774
+#: src/dird/ua_select.c:787
 #, c-format
 msgid "Please enter a number between 1 and %d\n"
 msgstr ""
 
-#: src/dird/ua_select.c:823
+#: src/dird/ua_select.c:836
 msgid "Storage name given twice.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:840
+#: src/dird/ua_select.c:853
 #, c-format
 msgid "Expecting jobid=nn command, got: %s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:844
+#: src/dird/ua_select.c:857
 #, c-format
 msgid "JobId %s is not running.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:854
+#: src/dird/ua_select.c:867
 #, c-format
 msgid "Expecting job=xxx, got: %s.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:858 src/dird/ua_select.c:870
+#: src/dird/ua_select.c:871 src/dird/ua_select.c:883
 #, c-format
 msgid "Job \"%s\" is not running.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:866
+#: src/dird/ua_select.c:879
 #, c-format
 msgid "Expecting ujobid=xxx, got: %s.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:886
+#: src/dird/ua_select.c:899
 #, c-format
 msgid "Storage resource \"%s\": not found\n"
 msgstr ""
 
-#: src/dird/ua_select.c:918
+#: src/dird/ua_select.c:931
 msgid "Enter autochanger drive[0]: "
 msgstr ""
 
-#: src/dird/ua_select.c:939
+#: src/dird/ua_select.c:952
 msgid "Enter autochanger slot: "
 msgstr ""
 
-#: src/dird/ua_select.c:969
+#: src/dird/ua_select.c:982
 msgid "Media Types defined in conf file:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:975
+#: src/dird/ua_select.c:988
 msgid "Media Type"
 msgstr ""
 
-#: src/dird/ua_select.c:975
+#: src/dird/ua_select.c:988
 msgid "Select the Media Type"
 msgstr ""
 
diff --git a/bacula/po/es.gmo b/bacula/po/es.gmo
index 0f4ae4c015..45d5c94a7f 100644
Binary files a/bacula/po/es.gmo and b/bacula/po/es.gmo differ
diff --git a/bacula/po/es.po b/bacula/po/es.po
index e4a5e832d2..58861826ec 100644
--- a/bacula/po/es.po
+++ b/bacula/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: branch 1.38\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-12-20 15:07+0100\n"
+"POT-Creation-Date: 2006-12-20 23:53+0100\n"
 "PO-Revision-Date: 2006-04-13 08:14+0200\n"
 "Last-Translator:  <kern@sibbald.com>\n"
 "Language-Team: Spanish\n"
@@ -1233,7 +1233,7 @@ msgid "%s: name=%s JobType=%d level=%s Priority=%d Enabled=%d\n"
 msgstr ""
 
 #: src/dird/dird_conf.c:584 src/dird/ua_cmds.c:455 src/dird/ua_prune.c:427
-#: src/dird/ua_run.c:576 src/dird/ua_select.c:250 src/dird/ua_select.c:273
+#: src/dird/ua_run.c:576 src/dird/ua_select.c:263 src/dird/ua_select.c:286
 msgid "Job"
 msgstr ""
 
@@ -2904,8 +2904,8 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: src/dird/ua_cmds.c:907 src/dird/ua_run.c:578 src/dird/ua_select.c:298
-#: src/dird/ua_select.c:407 src/wx-console/wxbrestorepanel.cpp:335
+#: src/dird/ua_cmds.c:907 src/dird/ua_run.c:578 src/dird/ua_select.c:311
+#: src/dird/ua_select.c:420 src/wx-console/wxbrestorepanel.cpp:335
 #: src/wx-console/wxbrestorepanel.cpp:353
 #: src/wx-console/wxbrestorepanel.cpp:430
 #: src/wx-console/wxbrestorepanel.cpp:431
@@ -3019,7 +3019,7 @@ msgstr ""
 msgid "%s Version: %s (%s)\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1617
+#: src/dird/ua_cmds.c:1617 src/dird/ua_select.c:221
 msgid "Could not find a Catalog resource\n"
 msgstr ""
 
@@ -3028,15 +3028,15 @@ msgstr ""
 msgid "Could not open catalog database \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:118 src/console/console.c:203
+#: src/dird/ua_dotcmds.c:121 src/console/console.c:203
 msgid ": is an invalid command\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:141
+#: src/dird/ua_dotcmds.c:144
 msgid "The Director will segment fault.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:255 src/dird/ua_restore.c:758
+#: src/dird/ua_dotcmds.c:259 src/dird/ua_restore.c:758
 #: src/dird/ua_restore.c:786 src/dird/ua_restore.c:807
 #, c-format
 msgid "Query failed: %s. ERR=%s\n"
@@ -3295,7 +3295,7 @@ msgstr ""
 msgid "No Pool specified.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:405 src/dird/ua_select.c:474
+#: src/dird/ua_output.c:405 src/dird/ua_select.c:487
 #, c-format
 msgid "Error obtaining pool ids. ERR=%s\n"
 msgstr ""
@@ -3609,7 +3609,7 @@ msgstr ""
 msgid "Improper date format: %s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:424 src/dird/ua_select.c:606
+#: src/dird/ua_restore.c:424 src/dird/ua_select.c:619
 #, c-format
 msgid "Error: Pool resource \"%s\" does not exist.\n"
 msgstr ""
@@ -4035,7 +4035,7 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: src/dird/ua_run.c:584 src/dird/ua_select.c:492 src/dird/ua_select.c:582
+#: src/dird/ua_run.c:584 src/dird/ua_select.c:505 src/dird/ua_select.c:595
 #: src/dird/ua_update.c:413 src/dird/ua_update.c:492
 #: src/wx-console/wxbrestorepanel.cpp:337
 #: src/wx-console/wxbrestorepanel.cpp:526
@@ -4328,196 +4328,200 @@ msgstr ""
 msgid "Select Storage resource"
 msgstr ""
 
-#: src/dird/ua_select.c:217
+#: src/dird/ua_select.c:224
+msgid "You must specify a \"use <catalog-name>\" command before continuing.\n"
+msgstr ""
+
+#: src/dird/ua_select.c:230
 msgid "The defined Catalog resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:225
+#: src/dird/ua_select.c:238
 msgid "Catalog"
 msgstr ""
 
-#: src/dird/ua_select.c:225
+#: src/dird/ua_select.c:238
 msgid "Select Catalog resource"
 msgstr ""
 
-#: src/dird/ua_select.c:242
+#: src/dird/ua_select.c:255
 msgid "The defined Job resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:250
+#: src/dird/ua_select.c:263
 msgid "Select Job resource"
 msgstr ""
 
-#: src/dird/ua_select.c:265
+#: src/dird/ua_select.c:278
 msgid "The defined Restore Job resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:273
+#: src/dird/ua_select.c:286
 msgid "Select Restore Job"
 msgstr ""
 
-#: src/dird/ua_select.c:290
+#: src/dird/ua_select.c:303
 msgid "The defined Client resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:298
+#: src/dird/ua_select.c:311
 msgid "Select Client (File daemon) resource"
 msgstr ""
 
-#: src/dird/ua_select.c:325
+#: src/dird/ua_select.c:338
 #, c-format
 msgid "Error: Client resource %s does not exist.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:350
+#: src/dird/ua_select.c:363
 #, c-format
 msgid "Could not find Client %s: ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:360 src/dird/ua_select.c:414
+#: src/dird/ua_select.c:373 src/dird/ua_select.c:427
 #, c-format
 msgid "Could not find Client \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:389
+#: src/dird/ua_select.c:402
 #, c-format
 msgid "Error obtaining client ids. ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:393
+#: src/dird/ua_select.c:406
 msgid "No clients defined. You must run a job before using this command.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:397
+#: src/dird/ua_select.c:410
 msgid "Defined Clients:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:407
+#: src/dird/ua_select.c:420
 msgid "Select the Client"
 msgstr ""
 
-#: src/dird/ua_select.c:440 src/dird/ua_select.c:463 src/dird/ua_select.c:499
+#: src/dird/ua_select.c:453 src/dird/ua_select.c:476 src/dird/ua_select.c:512
 #, c-format
 msgid "Could not find Pool \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:478
+#: src/dird/ua_select.c:491
 msgid "No pools defined. Use the \"create\" command to create one.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:482
+#: src/dird/ua_select.c:495
 msgid "Defined Pools:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:492
+#: src/dird/ua_select.c:505
 msgid "Select the Pool"
 msgstr ""
 
-#: src/dird/ua_select.c:522
+#: src/dird/ua_select.c:535
 #, c-format
 msgid "No access to Pool \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_select.c:548
+#: src/dird/ua_select.c:561
 msgid "Enter MediaId or Volume name: "
 msgstr ""
 
-#: src/dird/ua_select.c:574
+#: src/dird/ua_select.c:587
 msgid "The defined Pool resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:582
+#: src/dird/ua_select.c:595
 msgid "Select Pool resource"
 msgstr ""
 
-#: src/dird/ua_select.c:617
+#: src/dird/ua_select.c:630
 msgid "Enter the JobId to select: "
 msgstr ""
 
-#: src/dird/ua_select.c:655
+#: src/dird/ua_select.c:668
 #, c-format
 msgid "Could not find Job \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:733
+#: src/dird/ua_select.c:746
 #, c-format
 msgid "Automatically selected %s: %s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:738
+#: src/dird/ua_select.c:751
 #, c-format
 msgid "Cannot select %s in batch mode.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:752
+#: src/dird/ua_select.c:765
 #, c-format
 msgid "Selection list for \"%s\" is empty!\n"
 msgstr ""
 
-#: src/dird/ua_select.c:758
+#: src/dird/ua_select.c:771
 msgid "Item 1 selected automatically.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:769
+#: src/dird/ua_select.c:782
 msgid "Selection aborted, nothing done.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:774
+#: src/dird/ua_select.c:787
 #, c-format
 msgid "Please enter a number between 1 and %d\n"
 msgstr ""
 
-#: src/dird/ua_select.c:823
+#: src/dird/ua_select.c:836
 msgid "Storage name given twice.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:840
+#: src/dird/ua_select.c:853
 #, c-format
 msgid "Expecting jobid=nn command, got: %s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:844
+#: src/dird/ua_select.c:857
 #, c-format
 msgid "JobId %s is not running.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:854
+#: src/dird/ua_select.c:867
 #, c-format
 msgid "Expecting job=xxx, got: %s.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:858 src/dird/ua_select.c:870
+#: src/dird/ua_select.c:871 src/dird/ua_select.c:883
 #, c-format
 msgid "Job \"%s\" is not running.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:866
+#: src/dird/ua_select.c:879
 #, c-format
 msgid "Expecting ujobid=xxx, got: %s.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:886
+#: src/dird/ua_select.c:899
 #, c-format
 msgid "Storage resource \"%s\": not found\n"
 msgstr ""
 
-#: src/dird/ua_select.c:918
+#: src/dird/ua_select.c:931
 msgid "Enter autochanger drive[0]: "
 msgstr ""
 
-#: src/dird/ua_select.c:939
+#: src/dird/ua_select.c:952
 msgid "Enter autochanger slot: "
 msgstr ""
 
-#: src/dird/ua_select.c:969
+#: src/dird/ua_select.c:982
 msgid "Media Types defined in conf file:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:975
+#: src/dird/ua_select.c:988
 msgid "Media Type"
 msgstr ""
 
-#: src/dird/ua_select.c:975
+#: src/dird/ua_select.c:988
 msgid "Select the Media Type"
 msgstr ""
 
diff --git a/bacula/po/fr.gmo b/bacula/po/fr.gmo
index 5776e3c1b7..14c19c2e56 100644
Binary files a/bacula/po/fr.gmo and b/bacula/po/fr.gmo differ
diff --git a/bacula/po/fr.po b/bacula/po/fr.po
index 825b74bd49..dd3a50f398 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: 2006-12-20 15:07+0100\n"
+"POT-Creation-Date: 2006-12-20 23:53+0100\n"
 "PO-Revision-Date: 2006-11-20 20:16+0100\n"
 "Last-Translator: Eric Bollengier <eric@eb.homelinux.org>\n"
 "Language-Team: French <bacula-devel-fr@lists.sourceforge.net>\n"
@@ -1308,7 +1308,7 @@ msgid "%s: name=%s JobType=%d level=%s Priority=%d Enabled=%d\n"
 msgstr ""
 
 #: src/dird/dird_conf.c:584 src/dird/ua_cmds.c:455 src/dird/ua_prune.c:427
-#: src/dird/ua_run.c:576 src/dird/ua_select.c:250 src/dird/ua_select.c:273
+#: src/dird/ua_run.c:576 src/dird/ua_select.c:263 src/dird/ua_select.c:286
 msgid "Job"
 msgstr "Job"
 
@@ -3049,8 +3049,8 @@ msgstr "Director"
 msgid "Storage"
 msgstr "Stockage"
 
-#: src/dird/ua_cmds.c:907 src/dird/ua_run.c:578 src/dird/ua_select.c:298
-#: src/dird/ua_select.c:407 src/wx-console/wxbrestorepanel.cpp:335
+#: src/dird/ua_cmds.c:907 src/dird/ua_run.c:578 src/dird/ua_select.c:311
+#: src/dird/ua_select.c:420 src/wx-console/wxbrestorepanel.cpp:335
 #: src/wx-console/wxbrestorepanel.cpp:353
 #: src/wx-console/wxbrestorepanel.cpp:430
 #: src/wx-console/wxbrestorepanel.cpp:431
@@ -3176,7 +3176,7 @@ msgstr ""
 msgid "%s Version: %s (%s)\n"
 msgstr "%s Version : %s (%s)\n"
 
-#: src/dird/ua_cmds.c:1617
+#: src/dird/ua_cmds.c:1617 src/dird/ua_select.c:221
 msgid "Could not find a Catalog resource\n"
 msgstr "Impossible de trouver un Catalogue\n"
 
@@ -3185,16 +3185,16 @@ msgstr "Impossible de trouver un Catalogue\n"
 msgid "Could not open catalog database \"%s\".\n"
 msgstr "Impossible d'ouvrir la base de données « %s ».\n"
 
-#: src/dird/ua_dotcmds.c:118 src/console/console.c:203
+#: src/dird/ua_dotcmds.c:121 src/console/console.c:203
 #, fuzzy
 msgid ": is an invalid command\n"
 msgstr "%s : est une commande invalide.\n"
 
-#: src/dird/ua_dotcmds.c:141
+#: src/dird/ua_dotcmds.c:144
 msgid "The Director will segment fault.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:255 src/dird/ua_restore.c:758
+#: src/dird/ua_dotcmds.c:259 src/dird/ua_restore.c:758
 #: src/dird/ua_restore.c:786 src/dird/ua_restore.c:807
 #, c-format
 msgid "Query failed: %s. ERR=%s\n"
@@ -3463,7 +3463,7 @@ msgstr "JobId %d a utilis
 msgid "No Pool specified.\n"
 msgstr "Pas de Pool spécifié.\n"
 
-#: src/dird/ua_output.c:405 src/dird/ua_select.c:474
+#: src/dird/ua_output.c:405 src/dird/ua_select.c:487
 #, c-format
 msgid "Error obtaining pool ids. ERR=%s\n"
 msgstr "Erreur pendant lors de la récupération du pool. ERR=%s\n"
@@ -3805,7 +3805,7 @@ msgstr "Mot clef inconnu
 msgid "Improper date format: %s\n"
 msgstr "Format de date invalide : %s\n"
 
-#: src/dird/ua_restore.c:424 src/dird/ua_select.c:606
+#: src/dird/ua_restore.c:424 src/dird/ua_select.c:619
 #, c-format
 msgid "Error: Pool resource \"%s\" does not exist.\n"
 msgstr "Erreur : le Pool « %s » n'existe pas.\n"
@@ -4263,7 +4263,7 @@ msgstr "Quand"
 msgid "Priority"
 msgstr "Priorité"
 
-#: src/dird/ua_run.c:584 src/dird/ua_select.c:492 src/dird/ua_select.c:582
+#: src/dird/ua_run.c:584 src/dird/ua_select.c:505 src/dird/ua_select.c:595
 #: src/dird/ua_update.c:413 src/dird/ua_update.c:492
 #: src/wx-console/wxbrestorepanel.cpp:337
 #: src/wx-console/wxbrestorepanel.cpp:526
@@ -4620,200 +4620,204 @@ msgstr "Les ressources de Stockage d
 msgid "Select Storage resource"
 msgstr "Sélectionnez la ressource de Stockage"
 
-#: src/dird/ua_select.c:217
+#: src/dird/ua_select.c:224
+msgid "You must specify a \"use <catalog-name>\" command before continuing.\n"
+msgstr ""
+
+#: src/dird/ua_select.c:230
 msgid "The defined Catalog resources are:\n"
 msgstr "Les Catalogues définis sont :\n"
 
-#: src/dird/ua_select.c:225
+#: src/dird/ua_select.c:238
 msgid "Catalog"
 msgstr "Catalogue"
 
-#: src/dird/ua_select.c:225
+#: src/dird/ua_select.c:238
 msgid "Select Catalog resource"
 msgstr "Sélectionnez le Catalogue"
 
-#: src/dird/ua_select.c:242
+#: src/dird/ua_select.c:255
 msgid "The defined Job resources are:\n"
 msgstr "Les Job définis sont :\n"
 
-#: src/dird/ua_select.c:250
+#: src/dird/ua_select.c:263
 msgid "Select Job resource"
 msgstr "Sélectionnez le Job"
 
-#: src/dird/ua_select.c:265
+#: src/dird/ua_select.c:278
 msgid "The defined Restore Job resources are:\n"
 msgstr "Les Job de restauration sont :\n"
 
-#: src/dird/ua_select.c:273
+#: src/dird/ua_select.c:286
 msgid "Select Restore Job"
 msgstr "Sélectionnez le Job de restauration"
 
-#: src/dird/ua_select.c:290
+#: src/dird/ua_select.c:303
 msgid "The defined Client resources are:\n"
 msgstr "Les clients définis sont :\n"
 
-#: src/dird/ua_select.c:298
+#: src/dird/ua_select.c:311
 msgid "Select Client (File daemon) resource"
 msgstr "Sélectionnez le client (File daemon)"
 
-#: src/dird/ua_select.c:325
+#: src/dird/ua_select.c:338
 #, c-format
 msgid "Error: Client resource %s does not exist.\n"
 msgstr "Erreur : le client %s n'est pas définie.\n"
 
-#: src/dird/ua_select.c:350
+#: src/dird/ua_select.c:363
 #, c-format
 msgid "Could not find Client %s: ERR=%s"
 msgstr "Impossible de trouver le client %s : ERR=%s"
 
-#: src/dird/ua_select.c:360 src/dird/ua_select.c:414
+#: src/dird/ua_select.c:373 src/dird/ua_select.c:427
 #, c-format
 msgid "Could not find Client \"%s\": ERR=%s"
 msgstr "Impossible de trouver le client « %s » : ERR=%s"
 
-#: src/dird/ua_select.c:389
+#: src/dird/ua_select.c:402
 #, c-format
 msgid "Error obtaining client ids. ERR=%s\n"
 msgstr "Erreur pendant l'obtention de l'identifiant du Client. ERR=%s\n"
 
-#: src/dird/ua_select.c:393
+#: src/dird/ua_select.c:406
 msgid "No clients defined. You must run a job before using this command.\n"
 msgstr ""
 "Pas de client défini. Vous devez lancer une sauvegarde avant d'utiliser "
 "cette commande.\n"
 
-#: src/dird/ua_select.c:397
+#: src/dird/ua_select.c:410
 msgid "Defined Clients:\n"
 msgstr "Clients définis :\n"
 
-#: src/dird/ua_select.c:407
+#: src/dird/ua_select.c:420
 msgid "Select the Client"
 msgstr "Sélectionnez le client"
 
-#: src/dird/ua_select.c:440 src/dird/ua_select.c:463 src/dird/ua_select.c:499
+#: src/dird/ua_select.c:453 src/dird/ua_select.c:476 src/dird/ua_select.c:512
 #, c-format
 msgid "Could not find Pool \"%s\": ERR=%s"
 msgstr "Impossible de trouver le Pool « %s » : ERR=%s"
 
-#: src/dird/ua_select.c:478
+#: src/dird/ua_select.c:491
 msgid "No pools defined. Use the \"create\" command to create one.\n"
 msgstr ""
 "Pas de Pool défini. Utilisez la commande « create » pour en créer un.\n"
 
-#: src/dird/ua_select.c:482
+#: src/dird/ua_select.c:495
 msgid "Defined Pools:\n"
 msgstr "Pools définis :\n"
 
-#: src/dird/ua_select.c:492
+#: src/dird/ua_select.c:505
 msgid "Select the Pool"
 msgstr "Sélectionnez le Pool"
 
-#: src/dird/ua_select.c:522
+#: src/dird/ua_select.c:535
 #, c-format
 msgid "No access to Pool \"%s\"\n"
 msgstr "Pas d'accès au Pool « %s »\n"
 
-#: src/dird/ua_select.c:548
+#: src/dird/ua_select.c:561
 msgid "Enter MediaId or Volume name: "
 msgstr "Saisissez le MediaId ou le nom du Volume : "
 
-#: src/dird/ua_select.c:574
+#: src/dird/ua_select.c:587
 msgid "The defined Pool resources are:\n"
 msgstr "Les Pools définis sont :\n"
 
-#: src/dird/ua_select.c:582
+#: src/dird/ua_select.c:595
 msgid "Select Pool resource"
 msgstr "Sélectionnez le Pool"
 
-#: src/dird/ua_select.c:617
+#: src/dird/ua_select.c:630
 msgid "Enter the JobId to select: "
 msgstr "Entrez le JobId à sélectionner : "
 
-#: src/dird/ua_select.c:655
+#: src/dird/ua_select.c:668
 #, c-format
 msgid "Could not find Job \"%s\": ERR=%s"
 msgstr "Impossible de trouver le Job « %s » : ERR=%s"
 
-#: src/dird/ua_select.c:733
+#: src/dird/ua_select.c:746
 #, c-format
 msgid "Automatically selected %s: %s\n"
 msgstr "Sélection automatique %s : %s\n"
 
-#: src/dird/ua_select.c:738
+#: src/dird/ua_select.c:751
 #, c-format
 msgid "Cannot select %s in batch mode.\n"
 msgstr "Impossible de choisir %s en mode batch.\n"
 
-#: src/dird/ua_select.c:752
+#: src/dird/ua_select.c:765
 #, fuzzy, c-format
 msgid "Selection list for \"%s\" is empty!\n"
 msgstr "La sélection est vide !\n"
 
-#: src/dird/ua_select.c:758
+#: src/dird/ua_select.c:771
 msgid "Item 1 selected automatically.\n"
 msgstr "Sélection automatique de l'objet 1.\n"
 
-#: src/dird/ua_select.c:769
+#: src/dird/ua_select.c:782
 msgid "Selection aborted, nothing done.\n"
 msgstr "Sélection annulée, rien de fait.\n"
 
-#: src/dird/ua_select.c:774
+#: src/dird/ua_select.c:787
 #, c-format
 msgid "Please enter a number between 1 and %d\n"
 msgstr "Merci de saisir un nombre entre 1 et %d\n"
 
-#: src/dird/ua_select.c:823
+#: src/dird/ua_select.c:836
 msgid "Storage name given twice.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:840
+#: src/dird/ua_select.c:853
 #, c-format
 msgid "Expecting jobid=nn command, got: %s\n"
 msgstr "Attendait l'option jobid=nn, pas : %s\n"
 
-#: src/dird/ua_select.c:844
+#: src/dird/ua_select.c:857
 #, c-format
 msgid "JobId %s is not running.\n"
 msgstr "JobId %s n'est pas en cours.\n"
 
-#: src/dird/ua_select.c:854
+#: src/dird/ua_select.c:867
 #, c-format
 msgid "Expecting job=xxx, got: %s.\n"
 msgstr "Attendait l'option job=xxx, pas : %s\n"
 
-#: src/dird/ua_select.c:858 src/dird/ua_select.c:870
+#: src/dird/ua_select.c:871 src/dird/ua_select.c:883
 #, c-format
 msgid "Job \"%s\" is not running.\n"
 msgstr "Job « %s » n'est pas en cours.\n"
 
-#: src/dird/ua_select.c:866
+#: src/dird/ua_select.c:879
 #, fuzzy, c-format
 msgid "Expecting ujobid=xxx, got: %s.\n"
 msgstr "Attendait l'option job=xxx, pas : %s\n"
 
-#: src/dird/ua_select.c:886
+#: src/dird/ua_select.c:899
 #, c-format
 msgid "Storage resource \"%s\": not found\n"
 msgstr "Storage resource « %s » : non trouvé\n"
 
-#: src/dird/ua_select.c:918
+#: src/dird/ua_select.c:931
 msgid "Enter autochanger drive[0]: "
 msgstr "Saisissez le numéro du lecteur de l'autochanger [0] : "
 
-#: src/dird/ua_select.c:939
+#: src/dird/ua_select.c:952
 #, fuzzy
 msgid "Enter autochanger slot: "
 msgstr "Saisissez le numéro du lecteur de l'autochanger [0] : "
 
-#: src/dird/ua_select.c:969
+#: src/dird/ua_select.c:982
 msgid "Media Types defined in conf file:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:975
+#: src/dird/ua_select.c:988
 msgid "Media Type"
 msgstr ""
 
-#: src/dird/ua_select.c:975
+#: src/dird/ua_select.c:988
 msgid "Select the Media Type"
 msgstr "Choisissez le type de Media"
 
diff --git a/bacula/po/it.gmo b/bacula/po/it.gmo
index 0274babba2..e9051596df 100644
Binary files a/bacula/po/it.gmo and b/bacula/po/it.gmo differ
diff --git a/bacula/po/it.po b/bacula/po/it.po
index 2b4f4a1a68..e9b9ada7d5 100644
--- a/bacula/po/it.po
+++ b/bacula/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Bacula 1.38\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-12-20 15:07+0100\n"
+"POT-Creation-Date: 2006-12-20 23:53+0100\n"
 "PO-Revision-Date: 2005-08-08 17:50+0200\n"
 "Last-Translator:  <fparacchini@alteanet.it>\n"
 "Language-Team: Italian <bacula-devel@lists.sourceforge.net>\n"
@@ -1232,7 +1232,7 @@ msgid "%s: name=%s JobType=%d level=%s Priority=%d Enabled=%d\n"
 msgstr ""
 
 #: src/dird/dird_conf.c:584 src/dird/ua_cmds.c:455 src/dird/ua_prune.c:427
-#: src/dird/ua_run.c:576 src/dird/ua_select.c:250 src/dird/ua_select.c:273
+#: src/dird/ua_run.c:576 src/dird/ua_select.c:263 src/dird/ua_select.c:286
 msgid "Job"
 msgstr ""
 
@@ -2903,8 +2903,8 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: src/dird/ua_cmds.c:907 src/dird/ua_run.c:578 src/dird/ua_select.c:298
-#: src/dird/ua_select.c:407 src/wx-console/wxbrestorepanel.cpp:335
+#: src/dird/ua_cmds.c:907 src/dird/ua_run.c:578 src/dird/ua_select.c:311
+#: src/dird/ua_select.c:420 src/wx-console/wxbrestorepanel.cpp:335
 #: src/wx-console/wxbrestorepanel.cpp:353
 #: src/wx-console/wxbrestorepanel.cpp:430
 #: src/wx-console/wxbrestorepanel.cpp:431
@@ -3018,7 +3018,7 @@ msgstr ""
 msgid "%s Version: %s (%s)\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1617
+#: src/dird/ua_cmds.c:1617 src/dird/ua_select.c:221
 msgid "Could not find a Catalog resource\n"
 msgstr ""
 
@@ -3027,15 +3027,15 @@ msgstr ""
 msgid "Could not open catalog database \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:118 src/console/console.c:203
+#: src/dird/ua_dotcmds.c:121 src/console/console.c:203
 msgid ": is an invalid command\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:141
+#: src/dird/ua_dotcmds.c:144
 msgid "The Director will segment fault.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:255 src/dird/ua_restore.c:758
+#: src/dird/ua_dotcmds.c:259 src/dird/ua_restore.c:758
 #: src/dird/ua_restore.c:786 src/dird/ua_restore.c:807
 #, c-format
 msgid "Query failed: %s. ERR=%s\n"
@@ -3294,7 +3294,7 @@ msgstr ""
 msgid "No Pool specified.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:405 src/dird/ua_select.c:474
+#: src/dird/ua_output.c:405 src/dird/ua_select.c:487
 #, c-format
 msgid "Error obtaining pool ids. ERR=%s\n"
 msgstr ""
@@ -3608,7 +3608,7 @@ msgstr ""
 msgid "Improper date format: %s\n"
 msgstr ""
 
-#: src/dird/ua_restore.c:424 src/dird/ua_select.c:606
+#: src/dird/ua_restore.c:424 src/dird/ua_select.c:619
 #, c-format
 msgid "Error: Pool resource \"%s\" does not exist.\n"
 msgstr ""
@@ -4034,7 +4034,7 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: src/dird/ua_run.c:584 src/dird/ua_select.c:492 src/dird/ua_select.c:582
+#: src/dird/ua_run.c:584 src/dird/ua_select.c:505 src/dird/ua_select.c:595
 #: src/dird/ua_update.c:413 src/dird/ua_update.c:492
 #: src/wx-console/wxbrestorepanel.cpp:337
 #: src/wx-console/wxbrestorepanel.cpp:526
@@ -4327,196 +4327,200 @@ msgstr ""
 msgid "Select Storage resource"
 msgstr ""
 
-#: src/dird/ua_select.c:217
+#: src/dird/ua_select.c:224
+msgid "You must specify a \"use <catalog-name>\" command before continuing.\n"
+msgstr ""
+
+#: src/dird/ua_select.c:230
 msgid "The defined Catalog resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:225
+#: src/dird/ua_select.c:238
 msgid "Catalog"
 msgstr ""
 
-#: src/dird/ua_select.c:225
+#: src/dird/ua_select.c:238
 msgid "Select Catalog resource"
 msgstr ""
 
-#: src/dird/ua_select.c:242
+#: src/dird/ua_select.c:255
 msgid "The defined Job resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:250
+#: src/dird/ua_select.c:263
 msgid "Select Job resource"
 msgstr ""
 
-#: src/dird/ua_select.c:265
+#: src/dird/ua_select.c:278
 msgid "The defined Restore Job resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:273
+#: src/dird/ua_select.c:286
 msgid "Select Restore Job"
 msgstr ""
 
-#: src/dird/ua_select.c:290
+#: src/dird/ua_select.c:303
 msgid "The defined Client resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:298
+#: src/dird/ua_select.c:311
 msgid "Select Client (File daemon) resource"
 msgstr ""
 
-#: src/dird/ua_select.c:325
+#: src/dird/ua_select.c:338
 #, c-format
 msgid "Error: Client resource %s does not exist.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:350
+#: src/dird/ua_select.c:363
 #, c-format
 msgid "Could not find Client %s: ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:360 src/dird/ua_select.c:414
+#: src/dird/ua_select.c:373 src/dird/ua_select.c:427
 #, c-format
 msgid "Could not find Client \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:389
+#: src/dird/ua_select.c:402
 #, c-format
 msgid "Error obtaining client ids. ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:393
+#: src/dird/ua_select.c:406
 msgid "No clients defined. You must run a job before using this command.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:397
+#: src/dird/ua_select.c:410
 msgid "Defined Clients:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:407
+#: src/dird/ua_select.c:420
 msgid "Select the Client"
 msgstr ""
 
-#: src/dird/ua_select.c:440 src/dird/ua_select.c:463 src/dird/ua_select.c:499
+#: src/dird/ua_select.c:453 src/dird/ua_select.c:476 src/dird/ua_select.c:512
 #, c-format
 msgid "Could not find Pool \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:478
+#: src/dird/ua_select.c:491
 msgid "No pools defined. Use the \"create\" command to create one.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:482
+#: src/dird/ua_select.c:495
 msgid "Defined Pools:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:492
+#: src/dird/ua_select.c:505
 msgid "Select the Pool"
 msgstr ""
 
-#: src/dird/ua_select.c:522
+#: src/dird/ua_select.c:535
 #, c-format
 msgid "No access to Pool \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_select.c:548
+#: src/dird/ua_select.c:561
 msgid "Enter MediaId or Volume name: "
 msgstr ""
 
-#: src/dird/ua_select.c:574
+#: src/dird/ua_select.c:587
 msgid "The defined Pool resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:582
+#: src/dird/ua_select.c:595
 msgid "Select Pool resource"
 msgstr ""
 
-#: src/dird/ua_select.c:617
+#: src/dird/ua_select.c:630
 msgid "Enter the JobId to select: "
 msgstr ""
 
-#: src/dird/ua_select.c:655
+#: src/dird/ua_select.c:668
 #, c-format
 msgid "Could not find Job \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/ua_select.c:733
+#: src/dird/ua_select.c:746
 #, c-format
 msgid "Automatically selected %s: %s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:738
+#: src/dird/ua_select.c:751
 #, c-format
 msgid "Cannot select %s in batch mode.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:752
+#: src/dird/ua_select.c:765
 #, c-format
 msgid "Selection list for \"%s\" is empty!\n"
 msgstr ""
 
-#: src/dird/ua_select.c:758
+#: src/dird/ua_select.c:771
 msgid "Item 1 selected automatically.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:769
+#: src/dird/ua_select.c:782
 msgid "Selection aborted, nothing done.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:774
+#: src/dird/ua_select.c:787
 #, c-format
 msgid "Please enter a number between 1 and %d\n"
 msgstr ""
 
-#: src/dird/ua_select.c:823
+#: src/dird/ua_select.c:836
 msgid "Storage name given twice.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:840
+#: src/dird/ua_select.c:853
 #, c-format
 msgid "Expecting jobid=nn command, got: %s\n"
 msgstr ""
 
-#: src/dird/ua_select.c:844
+#: src/dird/ua_select.c:857
 #, c-format
 msgid "JobId %s is not running.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:854
+#: src/dird/ua_select.c:867
 #, c-format
 msgid "Expecting job=xxx, got: %s.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:858 src/dird/ua_select.c:870
+#: src/dird/ua_select.c:871 src/dird/ua_select.c:883
 #, c-format
 msgid "Job \"%s\" is not running.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:866
+#: src/dird/ua_select.c:879
 #, c-format
 msgid "Expecting ujobid=xxx, got: %s.\n"
 msgstr ""
 
-#: src/dird/ua_select.c:886
+#: src/dird/ua_select.c:899
 #, c-format
 msgid "Storage resource \"%s\": not found\n"
 msgstr ""
 
-#: src/dird/ua_select.c:918
+#: src/dird/ua_select.c:931
 msgid "Enter autochanger drive[0]: "
 msgstr ""
 
-#: src/dird/ua_select.c:939
+#: src/dird/ua_select.c:952
 msgid "Enter autochanger slot: "
 msgstr ""
 
-#: src/dird/ua_select.c:969
+#: src/dird/ua_select.c:982
 msgid "Media Types defined in conf file:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:975
+#: src/dird/ua_select.c:988
 msgid "Media Type"
 msgstr ""
 
-#: src/dird/ua_select.c:975
+#: src/dird/ua_select.c:988
 msgid "Select the Media Type"
 msgstr ""
 
diff --git a/bacula/src/dird/ua_dotcmds.c b/bacula/src/dird/ua_dotcmds.c
index ec084e252f..47a70898d4 100644
--- a/bacula/src/dird/ua_dotcmds.c
+++ b/bacula/src/dird/ua_dotcmds.c
@@ -109,7 +109,10 @@ int do_a_dot_command(UAContext *ua, const char *cmd)
    }
    for (i=0; i<(int)comsize; i++) {     /* search for command */
       if (strncasecmp(ua->argk[0],  _(commands[i].key), len) == 0) {
+         bool gui = ua->gui;
+         ua->gui = true;
          stat = (*commands[i].func)(ua, cmd);   /* go execute command */
+         ua->gui = gui;
          found = true;
          break;
       }
@@ -227,6 +230,7 @@ static int typescmd(UAContext *ua, const char *cmd)
    bsendmsg(ua, "Restore\n");
    bsendmsg(ua, "Admin\n");
    bsendmsg(ua, "Verify\n");
+   bsendmsg(ua, "Migrate\n");
    return 1;
 }
 
diff --git a/bacula/src/dird/ua_select.c b/bacula/src/dird/ua_select.c
index 9ef57dd2d0..9021229956 100644
--- a/bacula/src/dird/ua_select.c
+++ b/bacula/src/dird/ua_select.c
@@ -213,6 +213,19 @@ CAT *get_catalog_resource(UAContext *ua)
          }
       }
    }
+   if (ua->gui && !catalog) {
+      LockRes();
+      catalog = (CAT *)GetNextRes(R_CATALOG, NULL);
+      UnlockRes();
+      if (!catalog) {
+         bsendmsg(ua, _("Could not find a Catalog resource\n"));
+         return NULL;
+      } else if (!acl_access_ok(ua, Catalog_ACL, ua->catalog->hdr.name)) {
+         bsendmsg(ua, _("You must specify a \"use <catalog-name>\" command before continuing.\n"));
+         return NULL;
+      }
+      return catalog;
+   }
    if (!catalog) {
       start_prompt(ua, _("The defined Catalog resources are:\n"));
       LockRes();
diff --git a/bacula/technotes-1.39 b/bacula/technotes-1.39
index 0c5bc046ee..835057dfd8 100644
--- a/bacula/technotes-1.39
+++ b/bacula/technotes-1.39
@@ -3,6 +3,7 @@
 General:
 Version 1.39.32 released: 
 20Dec06
+kes  Take first catalog if gui is set, or if using dotcmd.
 kes  Fix a couple of compiler warnings in wx-console
 kes  Apply the immutable patch for FreeBSD hardlinked files supplied
      by Olivier Lehmann.