diff --git a/bacula/AUTHORS b/bacula/AUTHORS
index f9b62fa..5ea21c2 100644
--- a/bacula/AUTHORS
+++ b/bacula/AUTHORS
@@ -108,6 +108,7 @@ Rudolf Cejka
 Russel Howe
 Scott Bailey
 Sergey Svishchev
+Simone Caronni
 Stefan Reddig
 Thomas Glatthor
 Thorsten Enge
diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 63acc13..ec484d8 100755
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -114,31 +114,6 @@ installdirs:
 	   chgrp $(dir_group) $(DESTDIR)$(working_dir); \
 	fi
 
-gnomedirs:
-	$(MKDIR) $(DESTDIR)/usr/share/pixmaps
-	$(MKDIR) $(DESTDIR)/usr/share/gnome/apps/System
-	$(MKDIR) $(DESTDIR)/usr/share/applications
-	$(MKDIR) $(DESTDIR)/etc/security/console.apps
-	$(MKDIR) $(DESTDIR)/etc/pam.d
-
-install-menu: gnomedirs
-	${INSTALL_DATA} scripts/bacula.png $(DESTDIR)/usr/share/pixmaps/bacula.png
-	${INSTALL_DATA} scripts/bacula.desktop.gnome1 $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop
-	${INSTALL_DATA} scripts/bacula.desktop.gnome2 $(DESTDIR)/usr/share/applications/bacula.desktop
-
-install-menu-xsu: gnomedirs
-	${INSTALL_DATA} scripts/bacula.png $(DESTDIR)/usr/share/pixmaps/bacula.png
-	${INSTALL_DATA} scripts/bacula.desktop.gnome1.xsu $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop
-	${INSTALL_DATA} scripts/bacula.desktop.gnome2.xsu $(DESTDIR)/usr/share/applications/bacula.desktop
-
-install-menu-consolehelper: gnomedirs
-	${INSTALL_DATA} scripts/bacula.png $(DESTDIR)/usr/share/pixmaps/bacula.png
-	${INSTALL_DATA} scripts/bacula.desktop.gnome1.consolehelper $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop
-	${INSTALL_DATA} scripts/bacula.desktop.gnome2.consolehelper $(DESTDIR)/usr/share/applications/bacula.desktop
-	${INSTALL_DATA} scripts/gnome-console.console_apps $(DESTDIR)/etc/security/console.apps/gnome-console
-	${INSTALL_DATA} scripts/gnome-console.pamd $(DESTDIR)/etc/pam.d/gnome-console
-	ln -s $(DESTDIR)/usr/bin/consolehelper $(DESTDIR)/usr/bin/gnome-console
-
 install: installdirs
 	@for I in $(doc_files) ; do $(INSTALL_DATA) $$I $(DESTDIR)${docdir}; done
 	@for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
@@ -170,19 +145,6 @@ uninstall-autostart-fd:
 uninstall-autostart-sd:
 	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
-uninstall-menu:
-	$(RMF) $(DESTDIR)/usr/share/pixmaps/bacula.png
-	$(RMF) $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop
-	$(RMF) $(DESTDIR)/usr/share/applications/bacula.desktop
-
-uninstall-menu-consolehelper:
-	$(RMF) $(DESTDIR)/usr/share/pixmaps/bacula.png
-	$(RMF) $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop
-	$(RMF) $(DESTDIR)/usr/share/applications/bacula.desktop
-	$(RMF) $(DESTDIR)/etc/security/console.apps/gnome-console
-	$(RMF) $(DESTDIR)/etc/pam.d/gnome-console
-	$(RMF) $(DESTDIR)/usr/bin/gnome-console
-
 Makefile: Makefile.in
 	cd $(topdir) \
 	    && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/bacula/README b/bacula/README
index 8ac5920..01912f7 100644
--- a/bacula/README
+++ b/bacula/README
@@ -52,7 +52,7 @@ To start it (as a developer). This is not appropriate if you
 are installing Bacula.
 
    ./startit
-   ./console (or ./gnome-console)
+   ./console
 
 To stop it:
 
diff --git a/bacula/autoconf/config.guess b/bacula/autoconf/config.guess
index e3a2116..872b96a 100755
--- a/bacula/autoconf/config.guess
+++ b/bacula/autoconf/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2009-06-10'
+timestamp='2012-09-25'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2009-06-10'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -27,16 +25,16 @@ timestamp='2009-06-10'
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +54,9 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -144,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -180,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -201,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -223,7 +226,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +272,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,12 +301,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -333,6 +339,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -391,23 +400,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -477,8 +486,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -491,7 +500,7 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -548,7 +557,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -591,52 +600,52 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -727,22 +736,22 @@ EOF
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -766,14 +775,14 @@ EOF
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -785,34 +794,39 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -854,6 +868,27 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -861,20 +896,40 @@ EOF
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -901,39 +956,18 @@ EOF
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -942,14 +976,17 @@ EOF
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -957,67 +994,18 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1025,11 +1013,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1061,7 +1049,7 @@ EOF
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1089,13 +1077,13 @@ EOF
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1130,8 +1118,8 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1174,10 +1162,10 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1203,11 +1191,11 @@ EOF
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1220,6 +1208,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1247,6 +1238,16 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1262,7 +1263,10 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1307,13 +1311,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1331,11 +1335,11 @@ EOF
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
@@ -1353,11 +1357,11 @@ main ()
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 
diff --git a/bacula/autoconf/config.sub b/bacula/autoconf/config.sub
index eb0389a..826e4c6 100755
--- a/bacula/autoconf/config.sub
+++ b/bacula/autoconf/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2009-06-11'
+timestamp='2012-10-10'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2009-06-11'
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -32,13 +30,16 @@ timestamp='2009-06-11'
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -72,8 +73,9 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -120,13 +122,18 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -149,12 +156,12 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -170,10 +177,10 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -218,6 +225,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -242,20 +255,25 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -278,27 +296,39 @@ case $basic_machine in
 	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -308,6 +338,21 @@ case $basic_machine in
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -322,25 +367,30 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -362,24 +412,29 @@ case $basic_machine in
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
 	| tron-* \
-	| v850-* | v850e-* | vax-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -404,7 +459,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -474,11 +529,20 @@ case $basic_machine in
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -510,7 +574,7 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -668,7 +732,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -726,6 +789,13 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+	microblaze*)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -762,10 +832,18 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -830,6 +908,12 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -912,9 +996,10 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1008,6 +1093,9 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1064,20 +1152,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1147,6 +1223,9 @@ case $basic_machine in
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1244,9 +1323,12 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1268,21 +1350,22 @@ case $os in
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1290,7 +1373,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1329,7 +1412,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1378,7 +1461,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1423,6 +1506,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1445,10 +1530,10 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1460,8 +1545,20 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1481,14 +1578,11 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1515,7 +1609,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
diff --git a/bacula/autoconf/gnome-macros/Makefile b/bacula/autoconf/gnome-macros/Makefile
deleted file mode 100644
index a8037c3..0000000
--- a/bacula/autoconf/gnome-macros/Makefile
+++ /dev/null
@@ -1,254 +0,0 @@
-# Generated automatically from Makefile.in by configure.
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = /bin/sh
-
-srcdir = .
-top_srcdir = ..
-prefix = /usr/local
-exec_prefix = ${prefix}
-
-bindir = ${exec_prefix}/bin
-sbindir = ${exec_prefix}/sbin
-libexecdir = ${exec_prefix}/libexec
-datadir = ${prefix}/share
-sysconfdir = ${prefix}/etc
-sharedstatedir = ${prefix}/com
-localstatedir = ${prefix}/var
-libdir = ${exec_prefix}/lib
-infodir = ${prefix}/info
-mandir = ${prefix}/man
-includedir = ${prefix}/include
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/bacula
-pkglibdir = $(libdir)/bacula
-pkgincludedir = $(includedir)/bacula
-
-top_builddir = ..
-
-ACLOCAL = aclocal -I macros
-AUTOCONF = autoconf
-AUTOMAKE = automake
-AUTOHEADER = autoheader
-
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL_PROGRAM}
-transform = s,x,x,
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-CATALOGS = 
-CATOBJEXT = .gmo
-CC = gcc
-DATADIRNAME = share
-GENCAT = 
-GMOFILES = 
-GMSGFMT = /usr/bin/msgfmt
-GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib
-GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib
-GNOME_APPLETS_LIBS = 
-GNOME_CAPPLET_LIBS = 
-GNOME_CONFIG = /usr/bin/gnome-config
-GNOME_DOCKLETS_LIBS = 
-GNOME_INCLUDEDIR = -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2 -I/usr/X11R6/include
-GNOME_LIBDIR = -rdynamic -L/usr/lib -L/usr/X11R6/lib
-GNOME_LIBS = -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib
-GNORBA_CFLAGS = -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2 -I/usr/X11R6/include
-GNORBA_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib
-GTKXMHTML_LIBS = -rdynamic -lgtkxmhtml -lXpm -ljpeg -lpng -lz -lSM -lICE -lgtk -lgdk -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
-GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
-GTK_CONFIG = /usr/bin/gtk-config
-GTK_LIBS = -lSM -lICE -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
-GT_NO = 
-GT_YES = #YES#
-INCLUDE_LOCALE_H = #include <locale.h>
-INSTOBJEXT = .mo
-INTLDEPS = 
-INTLLIBS = 
-INTLOBJS = 
-MAKEINFO = makeinfo
-MKINSTALLDIRS = ./mkinstalldirs
-MSGFMT = /usr/bin/msgfmt
-ORBIT_CFLAGS = -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0
-ORBIT_CONFIG = /usr/bin/orbit-config
-ORBIT_IDL = /usr/bin/orbit-idl
-ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lnsl -lm
-PACKAGE = bacula
-POFILES = 
-POSUB = po
-PTHREAD_LIB = -lpthread
-RANLIB = ranlib
-USE_INCLUDED_LIBINTL = no
-USE_NLS = yes
-VERSION = 0.1
-XPM_LIBS = -lXpm
-ZVT_LIBS = -rdynamic -lzvt -lutil -lSM -lICE -lgdk_imlib -lgtk -lgdk -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
-cflags_set = yes
-cxxflags_set = @cxxflags_set@
-l = 
-
-MACROS =    aclocal-include.m4				  compiler-flags.m4				  curses.m4					  gnome-bonobo-check.m4				  gnome-fileutils.m4				  gnome-ghttp-check.m4				  gnome-gnorba-check.m4				  gnome-guile-checks.m4				  gnome-libgtop-check.m4			  gnome-objc-checks.m4				  gnome-orbit-check.m4				  gnome-print-check.m4				  gnome-pthread-check.m4			  gnome-support.m4				  gnome-undelfs.m4				  gnome-vfs.m4					  gnome-x-checks.m4				  gnome-xml-check.m4				  gnome.m4					  gperf-check.m4				  linger.m4					  need-declaration.m4				
-
-
-EXTRA_DIST = $(MACROS) gnome-common.m4 gnome-gettext.m4 autogen.sh
-MAINTAINERCLEANFILES = macros.dep
-
-#gnome_aclocaldir = $(datadir)/aclocal/gnome-macros
-
-#gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 	gnome-gettext.m4 autogen.sh
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(gnome_aclocal_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu macros/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-install-gnome_aclocalDATA: $(gnome_aclocal_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(gnome_aclocaldir)
-	@list='$(gnome_aclocal_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gnome_aclocaldir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gnome_aclocaldir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gnome_aclocaldir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(gnome_aclocaldir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-gnome_aclocalDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(gnome_aclocal_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(gnome_aclocaldir)/$$p; \
-	done
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = macros
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu macros/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-gnome_aclocalDATA
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-gnome_aclocalDATA
-uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(gnome_aclocaldir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-generic clean-am
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: uninstall-gnome_aclocalDATA install-gnome_aclocalDATA tags \
-distdir info-am info dvi-am dvi check check-am installcheck-am \
-installcheck install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-macros.dep: Makefile.am
-	@echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=macros/%)' > $@
-
-#gnome-macros.dep: Makefile.am
-#	@echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=$(gnome_aclocaldir)/%)' > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/bacula/autoconf/gnome-macros/Makefile.am b/bacula/autoconf/gnome-macros/Makefile.am
deleted file mode 100644
index f5cc043..0000000
--- a/bacula/autoconf/gnome-macros/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-## Please update this variable if any new macros are created
-
-MACROS=						\
-  aclocal-include.m4				\
-  compiler-flags.m4				\
-  curses.m4					\
-  gnome-bonobo-check.m4				\
-  gnome-fileutils.m4				\
-  gnome-ghttp-check.m4				\
-  gnome-gnorba-check.m4				\
-  gnome-guile-checks.m4				\
-  gnome-libgtop-check.m4			\
-  gnome-objc-checks.m4				\
-  gnome-orbit-check.m4				\
-  gnome-print-check.m4				\
-  gnome-pthread-check.m4			\
-  gnome-support.m4				\
-  gnome-undelfs.m4				\
-  gnome-vfs.m4					\
-  gnome-x-checks.m4				\
-  gnome-xml-check.m4				\
-  gnome.m4					\
-  gperf-check.m4				\
-  linger.m4					\
-  need-declaration.m4				
-
-EXTRA_DIST=$(MACROS) gnome-common.m4 gnome-gettext.m4 autogen.sh
-MAINTAINERCLEANFILES=macros.dep
-
-@MAINT@macros.dep: Makefile.am
-@MAINT@	@echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=macros/%)' > $@
-
-if INSIDE_GNOME_COMMON
-gnome_aclocaldir = $(datadir)/aclocal/gnome-macros
-
-gnome-macros.dep: Makefile.am
-	@echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=$(gnome_aclocaldir)/%)' > $@
-
-gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 \
-	gnome-gettext.m4 autogen.sh
-
-endif
diff --git a/bacula/autoconf/gnome-macros/Makefile.in b/bacula/autoconf/gnome-macros/Makefile.in
deleted file mode 100644
index 111a372..0000000
--- a/bacula/autoconf/gnome-macros/Makefile.in
+++ /dev/null
@@ -1,254 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-DATADIRNAME = @DATADIRNAME@
-GENCAT = @GENCAT@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@
-GNOMEUI_LIBS = @GNOMEUI_LIBS@
-GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@
-GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@
-GNOME_CONFIG = @GNOME_CONFIG@
-GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@
-GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@
-GNOME_LIBDIR = @GNOME_LIBDIR@
-GNOME_LIBS = @GNOME_LIBS@
-GNORBA_CFLAGS = @GNORBA_CFLAGS@
-GNORBA_LIBS = @GNORBA_LIBS@
-GTKXMHTML_LIBS = @GTKXMHTML_LIBS@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_CONFIG = @GTK_CONFIG@
-GTK_LIBS = @GTK_LIBS@
-GT_NO = @GT_NO@
-GT_YES = @GT_YES@
-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
-INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-ORBIT_CFLAGS = @ORBIT_CFLAGS@
-ORBIT_CONFIG = @ORBIT_CONFIG@
-ORBIT_IDL = @ORBIT_IDL@
-ORBIT_LIBS = @ORBIT_LIBS@
-PACKAGE = @PACKAGE@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PTHREAD_LIB = @PTHREAD_LIB@
-RANLIB = @RANLIB@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XPM_LIBS = @XPM_LIBS@
-ZVT_LIBS = @ZVT_LIBS@
-cflags_set = @cflags_set@
-cxxflags_set = @cxxflags_set@
-l = @l@
-
-MACROS =    aclocal-include.m4				  compiler-flags.m4				  curses.m4					  gnome-bonobo-check.m4				  gnome-fileutils.m4				  gnome-ghttp-check.m4				  gnome-gnorba-check.m4				  gnome-guile-checks.m4				  gnome-libgtop-check.m4			  gnome-objc-checks.m4				  gnome-orbit-check.m4				  gnome-print-check.m4				  gnome-pthread-check.m4			  gnome-support.m4				  gnome-undelfs.m4				  gnome-vfs.m4					  gnome-x-checks.m4				  gnome-xml-check.m4				  gnome.m4					  gperf-check.m4				  linger.m4					  need-declaration.m4				
-
-
-EXTRA_DIST = $(MACROS) gnome-common.m4 gnome-gettext.m4 autogen.sh
-MAINTAINERCLEANFILES = macros.dep
-
-@INSIDE_GNOME_COMMON_TRUE@gnome_aclocaldir = $(datadir)/aclocal/gnome-macros
-
-@INSIDE_GNOME_COMMON_TRUE@gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 	gnome-gettext.m4 autogen.sh
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(gnome_aclocal_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu macros/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-install-gnome_aclocalDATA: $(gnome_aclocal_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(gnome_aclocaldir)
-	@list='$(gnome_aclocal_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gnome_aclocaldir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gnome_aclocaldir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gnome_aclocaldir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(gnome_aclocaldir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-gnome_aclocalDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(gnome_aclocal_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(gnome_aclocaldir)/$$p; \
-	done
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = macros
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu macros/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-gnome_aclocalDATA
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-gnome_aclocalDATA
-uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(gnome_aclocaldir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-generic clean-am
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: uninstall-gnome_aclocalDATA install-gnome_aclocalDATA tags \
-distdir info-am info dvi-am dvi check check-am installcheck-am \
-installcheck install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-macros.dep: Makefile.am
-	@echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=macros/%)' > $@
-
-@INSIDE_GNOME_COMMON_TRUE@gnome-macros.dep: Makefile.am
-@INSIDE_GNOME_COMMON_TRUE@	@echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=$(gnome_aclocaldir)/%)' > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/bacula/autoconf/gnome-macros/aclocal-include.m4 b/bacula/autoconf/gnome-macros/aclocal-include.m4
deleted file mode 100644
index 43f9dbc..0000000
--- a/bacula/autoconf/gnome-macros/aclocal-include.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# aclocal-include.m4
-# 
-# This macro adds the name macrodir to the set of directories
-# that `aclocal' searches for macros.  
-
-# serial 1
-
-dnl AM_ACLOCAL_INCLUDE(macrodir)
-AC_DEFUN([AM_ACLOCAL_INCLUDE],
-[
-	AM_CONDITIONAL(INSIDE_GNOME_COMMON, false)
-
-	test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-
-	for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done
-])
diff --git a/bacula/autoconf/gnome-macros/autogen.sh b/bacula/autoconf/gnome-macros/autogen.sh
deleted file mode 100644
index 71f7dfc..0000000
--- a/bacula/autoconf/gnome-macros/autogen.sh
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-DIE=0
-
-if [ -n "$GNOME2_PATH" ]; then
-	ACLOCAL_FLAGS="-I $GNOME2_PATH/share/aclocal $ACLOCAL_FLAGS"
-	PATH="$GNOME2_PATH/bin:$PATH"
-	export PATH
-fi
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`autoconf' installed to compile $PKG_NAME."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo 
-    echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
-    echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
-    echo "(or a newer version if it is available)"
-    DIE=1
-  }
-}
-
-(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && {
-  (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo 
-    echo "**Error**: You must have \`xml-i18n-toolize' installed to compile $PKG_NAME."
-    echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/xml-i18n-tools/xml-i18n-tools-0.9.tar.gz"
-    echo "(or a newer version of xml-i18n-tools or intltool if it is available)"
-    DIE=1
-  }
-}
-
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`libtool' installed to compile $PKG_NAME."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
-    echo "(or a newer version if it is available)"
-    DIE=1
-  }
-}
-
-#grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
-#  grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
-#  (gettext --version) < /dev/null > /dev/null 2>&1 || {
-#    echo
-#    echo "**Error**: You must have \`gettext' installed to compile $PKG_NAME."
-#    echo "Get ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.10.39.tar.gz"
-#    echo "(or a newer version if it is available)"
-#    DIE=1
-#  }
-#}
-
-#grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && {
-#  grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
-#  (gettext --version) < /dev/null > /dev/null 2>&1 || {
-#    echo
-#    echo "**Error**: You must have \`gettext' installed to compile $PKG_NAME."
-#    echo "Get ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.10.39.tar.gz"
-#    echo "(or a newer version if it is available)"
-#    DIE=1
-#  }
-#}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`automake' installed to compile $PKG_NAME."
-  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
-  echo "(or a newer version if it is available)"
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
-  echo "installed doesn't appear recent enough."
-  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
-  echo "(or a newer version if it is available)"
-  DIE=1
-}
-
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run \`configure' with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo \`$0\'" command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-for coin in `find $srcdir -name configure.in -print`
-do 
-  dr=`dirname $coin`
-  if test -f $dr/NO-AUTO-GEN; then
-    echo skipping $dr -- flagged as no auto-gen
-  else
-    echo processing $dr
-    macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin`
-    ( cd $dr
-      macrosdir=`find . -name macros -print`
-      for i in $macrodirs; do
-	if test -f $i/gnome-gettext.m4; then
-	  DELETEFILES="$DELETEFILES $i/gnome-gettext.m4"
-	fi
-      done
-
-      echo "deletefiles is $DELETEFILES"
-      aclocalinclude="$ACLOCAL_FLAGS"
-      for k in $aclocalinclude; do
-  	if test -d $k; then
-	  if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then
-	    rm -f $DELETEFILES
-	  fi
-        fi
-      done
-      for k in $macrodirs; do
-  	if test -d $k; then
-          aclocalinclude="$aclocalinclude -I $k"
-	  if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then
-	    rm -f $DELETEFILES
-	  fi
-        fi
-      done
-      if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
-	if grep "sed.*POTFILES" configure.in >/dev/null; then
-	  : do nothing -- we still have an old unmodified configure.in
-	else
-	  echo "Creating $dr/aclocal.m4 ..."
-	  test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	  echo "Running gettextize...  Ignore non-fatal messages."
-	  echo "no" | gettextize --force --copy
-	  echo "Making $dr/aclocal.m4 writable ..."
-	  test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-        fi
-      fi
-      if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then
-	echo "Creating $dr/aclocal.m4 ..."
-	test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	echo "Running gettextize...  Ignore non-fatal messages."
-	echo "no" | gettextize --force --copy
-	echo "Making $dr/aclocal.m4 writable ..."
-	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-      fi
-      if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
-        echo "Running intltoolize..."
-	intltoolize --copy --force --automake
-      fi
-      if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
-        echo "Running xml-i18n-toolize..."
-	xml-i18n-toolize --copy --force --automake
-      fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
-	if test -z "$NO_LIBTOOLIZE" ; then 
-	  echo "Running libtoolize..."
-	  libtoolize --force --copy
-	fi
-      fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude || {
-	echo
-	echo "**Error**: aclocal failed. This may mean that you have not"
-	echo "installed all of the packages you need, or you may need to"
-	echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\""
-	echo "for the prefix where you installed the packages whose"
-	echo "macros were not found"
-	exit 1
-      }
-
-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
-	echo "Running autoheader..."
-	autoheader || { echo "**Error**: autoheader failed."; exit 1; }
-      fi
-      echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt ||
-	{ echo "**Error**: automake failed."; exit 1; }
-      echo "Running autoconf ..."
-      autoconf || { echo "**Error**: autoconf failed."; exit 1; }
-    ) || exit 1
-  fi
-done
-
-conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
-
-if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@" \
-  && echo Now type \`make\' to compile $PKG_NAME || exit 1
-else
-  echo Skipping configure process.
-fi
diff --git a/bacula/autoconf/gnome-macros/compiler-flags.m4 b/bacula/autoconf/gnome-macros/compiler-flags.m4
deleted file mode 100644
index 63f8e2e..0000000
--- a/bacula/autoconf/gnome-macros/compiler-flags.m4
+++ /dev/null
@@ -1,109 +0,0 @@
-dnl GNOME_COMPILE_WARNINGS
-dnl Turn on many useful compiler warnings
-dnl For now, only works on GCC
-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-  AC_ARG_ENABLE(compile-warnings, 
-    [  --enable-compile-warnings=[no/minimum/yes]	Turn on compiler warnings.],,enable_compile_warnings=minimum)
-
-  AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-  warnCFLAGS=
-  if test "x$GCC" != xyes; then
-    enable_compile_warnings=no
-  fi
-
-  if test "x$enable_compile_warnings" != "xno"; then
-    if test "x$GCC" = "xyes"; then
-      case " $CFLAGS " in
-      *[\ \	]-Wall[\ \	]*) ;;
-      *) warnCFLAGS="-Wall -Wunused" ;;
-      esac
-
-      ## -W is not all that useful.  And it cannot be controlled
-      ## with individual -Wno-xxx flags, unlike -Wall
-      if test "x$enable_compile_warnings" = "xyes"; then
-	warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations"
-      fi
-    fi
-  fi
-  AC_MSG_RESULT($warnCFLAGS)
-
-  AC_ARG_ENABLE(iso-c,
-    [  --enable-iso-c          Try to warn if code is not ISO C ],,
-    enable_iso_c=no)
-
-  AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-  complCFLAGS=
-  if test "x$enable_iso_c" != "xno"; then
-    if test "x$GCC" = "xyes"; then
-      case " $CFLAGS " in
-      *[\ \	]-ansi[\ \	]*) ;;
-      *) complCFLAGS="$complCFLAGS -ansi" ;;
-      esac
-
-      case " $CFLAGS " in
-      *[\ \	]-pedantic[\ \	]*) ;;
-      *) complCFLAGS="$complCFLAGS -pedantic" ;;
-      esac
-    fi
-  fi
-  AC_MSG_RESULT($complCFLAGS)
-  if test "x$cflags_set" != "xyes"; then
-    CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS"
-    cflags_set=yes
-    AC_SUBST(cflags_set)
-  fi
-])
-
-dnl For C++, do basically the same thing.
-
-AC_DEFUN([GNOME_CXX_WARNINGS],[
-  AC_ARG_ENABLE(cxx-warnings, 
-    [  --enable-cxx-warnings=[no/minimum/yes]	Turn on compiler warnings.],,enable_cxx_warnings=minimum)
-
-  AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-  warnCXXFLAGS=
-  if test "x$GCC" != xyes; then
-    enable_compile_warnings=no
-  fi
-  if test "x$enable_cxx_warnings" != "xno"; then
-    if test "x$GCC" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-Wall[\ \	]*) ;;
-      *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-      esac
-
-      ## -W is not all that useful.  And it cannot be controlled
-      ## with individual -Wno-xxx flags, unlike -Wall
-      if test "x$enable_cxx_warnings" = "xyes"; then
-	warnCXXFLAGS="$warnCXXFLAGS -Wmissing-prototypes -Wmissing-declarations -Wshadow -Woverloaded-virtual"
-      fi
-    fi
-  fi
-  AC_MSG_RESULT($warnCXXFLAGS)
-
-   AC_ARG_ENABLE(iso-cxx,
-     [  --enable-iso-cxx          Try to warn if code is not ISO C++ ],,
-     enable_iso_cxx=no)
-
-   AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-   complCXXFLAGS=
-   if test "x$enable_iso_cxx" != "xno"; then
-     if test "x$GCC" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-ansi[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-      esac
-
-      case " $CXXFLAGS " in
-      *[\ \	]-pedantic[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-      esac
-     fi
-   fi
-  AC_MSG_RESULT($complCXXFLAGS)
-  if test "x$cxxflags_set" != "xyes"; then
-    CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-    cxxflags_set=yes
-    AC_SUBST(cxxflags_set)
-  fi
-])
diff --git a/bacula/autoconf/gnome-macros/curses.m4 b/bacula/autoconf/gnome-macros/curses.m4
deleted file mode 100644
index 5307e13..0000000
--- a/bacula/autoconf/gnome-macros/curses.m4
+++ /dev/null
@@ -1,318 +0,0 @@
-dnl Curses detection: Munged from Midnight Commander's configure.in
-dnl
-dnl What it does:
-dnl =============
-dnl
-dnl - Determine which version of curses is installed on your system
-dnl   and set the -I/-L/-l compiler entries and add a few preprocessor
-dnl   symbols 
-dnl - Do an AC_SUBST on the CURSES_INCLUDEDIR and CURSES_LIBS so that
-dnl   @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in
-dnl   Makefile.in's
-dnl - Modify the following configure variables (these are the only
-dnl   curses.m4 variables you can access from within configure.in)
-dnl   CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if
-dnl                       an ncurses.h that's been renamed to curses.h
-dnl                       is found.
-dnl   CURSES_LIBS       - sets -L and -l's appropriately
-dnl   CFLAGS            - if --with-sco, add -D_SVID3 
-dnl   has_curses        - exports result of tests to rest of configure
-dnl
-dnl Usage:
-dnl ======
-dnl 1) Add lines indicated below to acconfig.h
-dnl 2) call AC_CHECK_CURSES after AC_PROG_CC in your configure.in
-dnl 3) Instead of #include <curses.h> you should use the following to
-dnl    properly locate ncurses or curses header file
-dnl
-dnl    #if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
-dnl    #include <ncurses.h>
-dnl    #else
-dnl    #include <curses.h>
-dnl    #endif
-dnl
-dnl 4) Make sure to add @CURSES_INCLUDEDIR@ to your preprocessor flags
-dnl 5) Make sure to add @CURSES_LIBS@ to your linker flags or LIBS
-dnl
-dnl Notes with automake:
-dnl - call AM_CONDITIONAL(HAS_CURSES, test "$has_curses" = true) from
-dnl   configure.in
-dnl - your Makefile.am can look something like this
-dnl   -----------------------------------------------
-dnl   INCLUDES= blah blah blah $(CURSES_INCLUDEDIR) 
-dnl   if HAS_CURSES
-dnl   CURSES_TARGETS=name_of_curses_prog
-dnl   endif
-dnl   bin_PROGRAMS = other_programs $(CURSES_TARGETS)
-dnl   other_programs_SOURCES = blah blah blah
-dnl   name_of_curses_prog_SOURCES = blah blah blah
-dnl   other_programs_LDADD = blah
-dnl   name_of_curses_prog_LDADD = blah $(CURSES_LIBS)
-dnl   -----------------------------------------------
-dnl
-dnl
-dnl The following lines should be added to acconfig.h:
-dnl ==================================================
-dnl
-dnl /*=== Curses version detection defines ===*/
-dnl /* Found some version of curses that we're going to use */
-dnl #undef HAS_CURSES
-dnl    
-dnl /* Use SunOS SysV curses? */
-dnl #undef USE_SUNOS_CURSES
-dnl 
-dnl /* Use old BSD curses - not used right now */
-dnl #undef USE_BSD_CURSES
-dnl 
-dnl /* Use SystemV curses? */
-dnl #undef USE_SYSV_CURSES
-dnl 
-dnl /* Use Ncurses? */
-dnl #undef USE_NCURSES
-dnl 
-dnl /* If you Curses does not have color define this one */
-dnl #undef NO_COLOR_CURSES
-dnl 
-dnl /* Define if you want to turn on SCO-specific code */
-dnl #undef SCO_FLAVOR
-dnl 
-dnl /* Set to reflect version of ncurses *
-dnl  *   0 = version 1.*
-dnl  *   1 = version 1.9.9g
-dnl  *   2 = version 4.0/4.1 */
-dnl #undef NCURSES_970530
-dnl
-dnl /*=== End new stuff for acconfig.h ===*/
-dnl 
-
-
-AC_DEFUN([AC_CHECK_CURSES],[
-	search_ncurses=true
-	screen_manager=""
-	has_curses=false
-
-	CFLAGS=${CFLAGS--O}
-
-	AC_SUBST(CURSES_LIBS)
-	AC_SUBST(CURSES_INCLUDEDIR)
-
-	AC_ARG_WITH(sco,
-	  [  --with-sco              Use this to turn on SCO-specific code],[
-	  if test x$withval = xyes; then
-		AC_DEFINE(SCO_FLAVOR)
-		CFLAGS="$CFLAGS -D_SVID3"
-	  fi
-	])
-
-	AC_ARG_WITH(sunos-curses,
-	  [  --with-sunos-curses     Used to force SunOS 4.x curses],[
-	  if test x$withval = xyes; then
-		AC_USE_SUNOS_CURSES
-	  fi
-	])
-
-	AC_ARG_WITH(osf1-curses,
-	  [  --with-osf1-curses      Used to force OSF/1 curses],[
-	  if test x$withval = xyes; then
-		AC_USE_OSF1_CURSES
-	  fi
-	])
-
-	AC_ARG_WITH(vcurses,
-	  [  --with-vcurses[=incdir] Used to force SysV curses],
-	  if test x$withval != xyes; then
-		CURSES_INCLUDEDIR="-I$withval"
-	  fi
-	  AC_USE_SYSV_CURSES
-	)
-
-	AC_ARG_WITH(ncurses,
-	  [  --with-ncurses[=dir]  Compile with ncurses/locate base dir],
-	  if test x$withval = xno ; then
-		search_ncurses=false
-	  elif test x$withval != xyes ; then
-		CURSES_LIBS="$LIBS -L$withval/lib -lncurses"
-		CURSES_INCLUDEDIR="-I$withval/include"
-		search_ncurses=false
-		screen_manager="ncurses"
-		AC_DEFINE(USE_NCURSES)
-		AC_DEFINE(HAS_CURSES)
-		has_curses=true
-	  fi
-	)
-
-	if $search_ncurses
-	then
-		AC_SEARCH_NCURSES()
-	fi
-
-
-])
-
-
-AC_DEFUN([AC_USE_SUNOS_CURSES], [
-	search_ncurses=false
-	screen_manager="SunOS 4.x /usr/5include curses"
-	AC_MSG_RESULT(Using SunOS 4.x /usr/5include curses)
-	AC_DEFINE(USE_SUNOS_CURSES)
-	AC_DEFINE(HAS_CURSES)
-	has_curses=true
-	AC_DEFINE(NO_COLOR_CURSES)
-	AC_DEFINE(USE_SYSV_CURSES)
-	CURSES_INCLUDEDIR="-I/usr/5include"
-	CURSES_LIBS="/usr/5lib/libcurses.a /usr/5lib/libtermcap.a"
-	AC_MSG_RESULT(Please note that some screen refreshs may fail)
-])
-
-AC_DEFUN([AC_USE_OSF1_CURSES], [
-       AC_MSG_RESULT(Using OSF1 curses)
-       search_ncurses=false
-       screen_manager="OSF1 curses"
-       AC_DEFINE(HAS_CURSES)
-       has_curses=true
-       AC_DEFINE(NO_COLOR_CURSES)
-       AC_DEFINE(USE_SYSV_CURSES)
-       CURSES_LIBS="-lcurses"
-])
-
-AC_DEFUN([AC_USE_SYSV_CURSES], [
-	AC_MSG_RESULT(Using SysV curses)
-	AC_DEFINE(HAS_CURSES)
-	has_curses=true
-	AC_DEFINE(USE_SYSV_CURSES)
-	search_ncurses=false
-	screen_manager="SysV/curses"
-	CURSES_LIBS="-lcurses"
-])
-
-dnl AC_ARG_WITH(bsd-curses,
-dnl [--with-bsd-curses         Used to compile with bsd curses, not very fancy],
-dnl 	search_ncurses=false
-dnl	screen_manager="Ultrix/cursesX"
-dnl	if test $system = ULTRIX
-dnl	then
-dnl	    THIS_CURSES=cursesX
-dnl        else
-dnl	    THIS_CURSES=curses
-dnl	fi
-dnl
-dnl	CURSES_LIBS="-l$THIS_CURSES -ltermcap"
-dnl	AC_DEFINE(HAS_CURSES)
-dnl	has_curses=true
-dnl	AC_DEFINE(USE_BSD_CURSES)
-dnl	AC_MSG_RESULT(Please note that some screen refreshs may fail)
-dnl	AC_MSG_WARN(Use of the bsdcurses extension has some)
-dnl	AC_MSG_WARN(display/input problems.)
-dnl	AC_MSG_WARN(Reconsider using xcurses)
-dnl)
-
-	
-dnl
-dnl Parameters: directory filename cureses_LIBS curses_INCLUDEDIR nicename
-dnl
-AC_DEFUN([AC_NCURSES], [
-    if $search_ncurses
-    then
-        if test -f $1/$2
-	then
-	    AC_MSG_RESULT(Found ncurses on $1/$2)
- 	    CURSES_LIBS="$3"
-	    CURSES_INCLUDEDIR="$4"
-	    search_ncurses=false
-	    screen_manager=$5
-            AC_DEFINE(HAS_CURSES)
-            has_curses=true
-	    AC_DEFINE(USE_NCURSES)
-	fi
-    fi
-])
-
-AC_DEFUN([AC_SEARCH_NCURSES], [
-    AC_CHECKING("location of ncurses.h file")
-
-    AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include")
-    AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
-    AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include, "ncurses on /usr/local")
-    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses -lncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
-
-    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
-
-    AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
-
-    dnl
-    dnl We couldn't find ncurses, try SysV curses
-    dnl
-    if $search_ncurses 
-    then
-        AC_EGREP_HEADER(init_color, /usr/include/curses.h,
-	    AC_USE_SYSV_CURSES)
-	AC_EGREP_CPP(USE_NCURSES,[
-#include <curses.h>
-#ifdef __NCURSES_H
-#undef USE_NCURSES
-USE_NCURSES
-#endif
-],[
-	CURSES_INCLUDEDIR="$CURSES_INCLUDEDIR -DRENAMED_NCURSES"
-        AC_DEFINE(HAS_CURSES)
-	has_curses=true
-        AC_DEFINE(USE_NCURSES)
-        search_ncurses=false
-        screen_manager="ncurses installed as curses"
-])
-    fi
-
-    dnl
-    dnl Try SunOS 4.x /usr/5{lib,include} ncurses
-    dnl The flags USE_SUNOS_CURSES, USE_BSD_CURSES and BUGGY_CURSES
-    dnl should be replaced by a more fine grained selection routine
-    dnl
-    if $search_ncurses
-    then
-	if test -f /usr/5include/curses.h
-	then
-	    AC_USE_SUNOS_CURSES
-        fi
-    else
-        # check for ncurses version, to properly ifdef mouse-fix
-	AC_MSG_CHECKING(for ncurses version)
-	ncurses_version=unknown
-cat > conftest.$ac_ext <<EOF
-[#]line __oline__ "configure"
-#include "confdefs.h"
-#ifdef RENAMED_NCURSES
-#include <curses.h>
-#else
-#include <ncurses.h>
-#endif
-#undef VERSION
-VERSION:NCURSES_VERSION
-EOF
-        if (eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC |
-  egrep "VERSION:" >conftest.out 2>&1; then
-changequote(,)dnl
-            ncurses_version=`cat conftest.out|sed -e 's/^[^"]*"//' -e 's/".*//'`
-changequote([,])dnl
-	fi
-	rm -rf conftest*
-        AC_MSG_RESULT($ncurses_version)
-	case "$ncurses_version" in
-changequote(,)dnl
-	4.[01])
-changequote([,])dnl
-            AC_DEFINE(NCURSES_970530,2)
-            ;;
-	1.9.9g)
-            AC_DEFINE(NCURSES_970530,1)
-            ;;
-	1*)
-            AC_DEFINE(NCURSES_970530,0)
-            ;;
-	esac
-    fi
-])
-
-
-
-
-
diff --git a/bacula/autoconf/gnome-macros/gnome-bonobo-check.m4 b/bacula/autoconf/gnome-macros/gnome-bonobo-check.m4
deleted file mode 100644
index daa109c..0000000
--- a/bacula/autoconf/gnome-macros/gnome-bonobo-check.m4
+++ /dev/null
@@ -1,166 +0,0 @@
-# Configure paths for Bonobo
-# Miguel de Icaza, 99-04-12
-# Stolen from Chris Lahey	99-2-5
-# stolen from Manish Singh again
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_BONOBO ([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for Bonobo, and define BONOBO_CFLAGS and BONOBO_LIBS
-dnl
-AC_DEFUN([AM_PATH_BONOBO],
-[
-dnl 
-dnl Get the cflags and libraries from the gnome-config script
-dnl
-AC_ARG_WITH(bonobo-prefix,[  --with-bonobo-prefix=PFX   Prefix where Bonobo is installed (optional)],
-            bonobo_prefix="$withval", bonobo_prefix="")
-AC_ARG_WITH(bonobo-exec-prefix,[  --with-bonobo-exec-prefix=PFX Exec prefix where Bonobo is installed (optional)],
-            bonobo_exec_prefix="$withval", bonobo_exec_prefix="")
-AC_ARG_ENABLE(bonobotest, [  --disable-bonobotest       Do not try to compile and run a test Bonobo program],
-		    , enable_bonobotest=yes)
-
-  if test x$bonobo_exec_prefix != x ; then
-     bonobo_args="$bonobo_args --exec-prefix=$bonobo_exec_prefix"
-     if test x${GNOME_CONFIG+set} != xset ; then
-        GNOME_CONFIG=$bonobo_exec_prefix/bin/gnome-config
-     fi
-  fi
-  if test x$bonobo_prefix != x ; then
-     bonobo_args="$bonobo_args --prefix=$bonobo_prefix"
-     if test x${GNOME_CONFIG+set} != xset ; then
-        GNOME_CONFIG=$bonobo_prefix/bin/gnome-config
-     fi
-  fi
-
-  AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
-  min_bonobo_version=ifelse([$1], ,0.1.0,$1)
-  AC_MSG_CHECKING(for BONOBO - version >= $min_bonobo_version)
-  no_bonobo=""
-  if test "$GNOME_CONFIG" = "no" ; then
-    no_bonobo=yes
-  else
-    BONOBO_CFLAGS=`$GNOME_CONFIG $bonoboconf_args --cflags bonobo bonobox`
-    BONOBO_LIBS=`$GNOME_CONFIG $bonoboconf_args --libs bonobo bonobox`
-
-    bonobo_major_version=`$GNOME_CONFIG $bonobo_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    bonobo_minor_version=`$GNOME_CONFIG $bonobo_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    bonobo_micro_version=`$GNOME_CONFIG $bonobo_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_bonobotest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $BONOBO_CFLAGS"
-      LIBS="$LIBS $BONOBO_LIBS"
-dnl
-dnl Now check if the installed BONOBO is sufficiently new. (Also sanity
-dnl checks the results of gnome-config to some extent
-dnl
-      rm -f conf.bonobotest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <bonobo.h>
-
-static char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.bonobotest");
-  bonobo_object_get_type ();
-  return 0;
-}
-
-],, no_bonobo=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_bonobo" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$GNOME_CONFIG" = "no" ; then
-       echo "*** The gnome-config script installed by GNOME-LIBS could not be found"
-       echo "*** If BONOBO was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GNOME_CONFIG environment variable to the"
-       echo "*** full path to gnome-config."
-     else
-       if test -f conf.bonobotest ; then
-        :
-       else
-          echo "*** Could not run BONOBO test program, checking why..."
-          CFLAGS="$CFLAGS $BONOBO_CFLAGS"
-          LIBS="$LIBS $BONOBO_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include <bonobo/gnome-object.h>
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding BONOBO or finding the wrong"
-          echo "*** version of BONOBO. If it is not finding BONOBO, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means BONOBO was incorrectly installed"
-          echo "*** or that you have moved BONOBO since it was installed. In the latter case, you"
-          echo "*** may want to edit the gnome-config script: $GNOME_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     BONOBO_CFLAGS=""
-     BONOBO_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(BONOBO_CFLAGS)
-  AC_SUBST(BONOBO_LIBS)
-  rm -f conf.bonobotest
-])
-
-AC_DEFUN([BONOBO_CHECK], [
-	AM_PATH_BONOBO(0.1.0,,[AC_MSG_ERROR(BONOBO not found)])
-])
-
-AC_DEFUN([AM_BONOBO_USES_OAF],
-[
-	AC_REQUIRE([AM_PATH_BONOBO])
-
-	AC_MSG_CHECKING(if Bonobo uses OAF)
-	if ( gnome-config --libs bonobo | grep oaf ) > /dev/null 2>&1 ; then
-	  using_oaf="yes"
-	  AC_DEFINE(BONOBO_USES_OAF)
-	else
-	  using_oaf="no"
-	fi
-
-	AC_MSG_RESULT("$using_oaf")
-
-	AM_CONDITIONAL(BONOBO_USES_OAF, test x"using_oaf" = "xyes")
-])
diff --git a/bacula/autoconf/gnome-macros/gnome-common.m4 b/bacula/autoconf/gnome-macros/gnome-common.m4
deleted file mode 100644
index 83bb00d..0000000
--- a/bacula/autoconf/gnome-macros/gnome-common.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-# gnome-common.m4
-# 
-# This only for packages that are not in the GNOME CVS tree.
-
-dnl GNOME_COMMON_INIT
-
-AC_DEFUN([GNOME_COMMON_INIT],
-[
-	GNOME_ACLOCAL_DIR="$GNOME_COMMON_MACROS_DIR"
-	AC_SUBST(GNOME_ACLOCAL_DIR)
-
-	ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-])
-
diff --git a/bacula/autoconf/gnome-macros/gnome-fileutils.m4 b/bacula/autoconf/gnome-macros/gnome-fileutils.m4
deleted file mode 100644
index a8456f2..0000000
--- a/bacula/autoconf/gnome-macros/gnome-fileutils.m4
+++ /dev/null
@@ -1,414 +0,0 @@
-dnl
-dnl GNOME_FILEUTILS_CHECKS
-dnl
-dnl checks that are needed for the diskusage applet.
-dnl
-
-AC_DEFUN([GNOME_FILEUTILS_CHECKS],
-[	
-AC_CHECK_HEADERS(fcntl.h sys/param.h sys/statfs.h sys/fstyp.h \
-mnttab.h mntent.h sys/statvfs.h sys/vfs.h sys/mount.h \
-sys/filsys.h sys/fs_types.h sys/fs/s5param.h)
-
-AC_CHECK_FUNCS(bcopy endgrent endpwent fchdir ftime ftruncate \
-getcwd getmntinfo gettimeofday isascii lchown \
-listmntent memcpy mkfifo strchr strerror strrchr vprintf)
-
-dnl Set some defaults when cross-compiling
-
-if test x$cross_compiling = xyes ; then
-	case "$host_os" in
-	linux*)
-	  fu_cv_sys_mounted_getmntent1=yes
-	  fu_cv_sys_stat_statfs2_bsize=yes
-	  ;;
-	sunos*)
-	  fu_cv_sys_stat_statfs4=yes
-	  ;;
-	freebsd*)
-	  fu_cv_sys_stat_statfs2_bsize=yes
-	  ;;
-	osf*)
-	  fu_cv_sys_stat_statfs3_osf1=yes
-	  ;;
-	esac
-fi
-
-# Determine how to get the list of mounted filesystems.
-list_mounted_fs=
-
-# If the getmntent function is available but not in the standard library,
-# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX).
-AC_FUNC_GETMNTENT
-
-# This test must precede the ones for getmntent because Unicos-9 is
-# reported to have the getmntent function, but its support is incompatible
-# with other getmntent implementations.
-
-# NOTE: Normally, I wouldn't use a check for system type as I've done for
-# `CRAY' below since that goes against the whole autoconf philosophy.  But
-# I think there is too great a chance that some non-Cray system has a
-# function named listmntent to risk the false positive.
-
-if test -z "$list_mounted_fs"; then
-# Cray UNICOS 9
-AC_MSG_CHECKING([for listmntent of Cray/Unicos-9])
-AC_CACHE_VAL(fu_cv_sys_mounted_cray_listmntent,
-[fu_cv_sys_mounted_cray_listmntent=no
-AC_EGREP_CPP(yes,
-[#ifdef _CRAY
-yes
-#endif
-], [test $ac_cv_func_listmntent = yes \
-&& fu_cv_sys_mounted_cray_listmntent=yes]
-)
-]
-)
-AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent)
-if test $fu_cv_sys_mounted_cray_listmntent = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_LISTMNTENT)
-fi
-fi
-
-if test $ac_cv_func_getmntent = yes; then
-
-# This system has the getmntent function.
-# Determine whether it's the one-argument variant or the two-argument one.
-
-if test -z "$list_mounted_fs"; then
-# 4.3BSD, SunOS, HP-UX, Dynix, Irix
-AC_MSG_CHECKING([for one-argument getmntent function])
-AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1,
-[test $ac_cv_header_mntent_h = yes \
-&& fu_cv_sys_mounted_getmntent1=yes \
-|| fu_cv_sys_mounted_getmntent1=no])
-AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1)
-if test $fu_cv_sys_mounted_getmntent1 = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTENT1)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-# SVR4
-AC_MSG_CHECKING([for two-argument getmntent function])
-AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2,
-[AC_EGREP_HEADER(getmntent, sys/mnttab.h,
-fu_cv_sys_mounted_getmntent2=yes,
-fu_cv_sys_mounted_getmntent2=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2)
-if test $fu_cv_sys_mounted_getmntent2 = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTENT2)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
-fi
-
-fi
-
-if test -z "$list_mounted_fs"; then
-# DEC Alpha running OSF/1.
-AC_MSG_CHECKING([for getfsstat function])
-AC_CACHE_VAL(fu_cv_sys_mounted_getsstat,
-[AC_TRY_LINK([
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <sys/fs_types.h>],
-[struct statfs *stats;
-int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ],
-fu_cv_sys_mounted_getsstat=yes,
-fu_cv_sys_mounted_getsstat=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_getsstat)
-if test $fu_cv_sys_mounted_getsstat = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETFSSTAT)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-# AIX.
-AC_MSG_CHECKING([for mntctl function and struct vmount])
-AC_CACHE_VAL(fu_cv_sys_mounted_vmount,
-[AC_TRY_CPP([#include <fshelp.h>],
-fu_cv_sys_mounted_vmount=yes,
-fu_cv_sys_mounted_vmount=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_vmount)
-if test $fu_cv_sys_mounted_vmount = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_VMOUNT)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-# SVR3
-AC_MSG_CHECKING([for FIXME existence of three headers])
-AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp,
-[AC_TRY_CPP([
-#include <sys/statfs.h>
-#include <sys/fstyp.h>
-#include <mnttab.h>],
-fu_cv_sys_mounted_fread_fstyp=yes,
-fu_cv_sys_mounted_fread_fstyp=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp)
-if test $fu_cv_sys_mounted_fread_fstyp = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_FREAD_FSTYP)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-# 4.4BSD and DEC OSF/1.
-AC_MSG_CHECKING([for getmntinfo function])
-AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo,
-[
-ok=
-if test $ac_cv_func_getmntinfo = yes; then
-AC_EGREP_HEADER(f_type;, sys/mount.h,
-ok=yes)
-fi
-test -n "$ok" \
-&& fu_cv_sys_mounted_getmntinfo=yes \
-|| fu_cv_sys_mounted_getmntinfo=no
-])
-AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo)
-if test $fu_cv_sys_mounted_getmntinfo = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTINFO)
-fi
-fi
-
-# FIXME: add a test for netbsd-1.1 here
-
-if test -z "$list_mounted_fs"; then
-# Ultrix
-AC_MSG_CHECKING([for getmnt function])
-AC_CACHE_VAL(fu_cv_sys_mounted_getmnt,
-[AC_TRY_CPP([
-#include <sys/fs_types.h>
-#include <sys/mount.h>],
-fu_cv_sys_mounted_getmnt=yes,
-fu_cv_sys_mounted_getmnt=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_getmnt)
-if test $fu_cv_sys_mounted_getmnt = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNT)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-# SVR2
-AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab])
-AC_CACHE_VAL(fu_cv_sys_mounted_fread,
-[AC_TRY_CPP([#include <mnttab.h>],
-fu_cv_sys_mounted_fread=yes,
-fu_cv_sys_mounted_fread=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_fread)
-if test $fu_cv_sys_mounted_fread = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_FREAD)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
-# FIXME -- no need to abort building the whole package
-# Cannot build mountlist.c or anything that needs its functions
-fi
-
-AC_CHECKING(how to get filesystem space usage)
-space=no
-
-# Perform only the link test since it seems there are no variants of the
-# statvfs function.  This check is more than just AC_CHECK_FUNCS(statvfs)
-# because that got a false positive on SCO OSR5.  Adding the declaration
-# of a `struct statvfs' causes this test to fail (as it should) on such
-# systems.  That system is reported to work fine with STAT_STATFS4 which
-# is what it gets when this test fails.
-if test $space = no; then
-# SVR4
-AC_CACHE_CHECK([statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
-[AC_TRY_LINK([#include <sys/types.h>
-#include <sys/statvfs.h>],
-[struct statvfs fsd; statvfs (0, &fsd);],
-fu_cv_sys_stat_statvfs=yes,
-fu_cv_sys_stat_statvfs=no)])
-if test $fu_cv_sys_stat_statvfs = yes; then
-space=yes
-AC_DEFINE(STAT_STATVFS)
-fi
-fi
-
-if test $space = no; then
-# DEC Alpha running OSF/1
-AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
-AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1,
-[AC_TRY_RUN([
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-int main ()
-{
-struct statfs fsd;
-fsd.f_fsize = 0;
-return (statfs (".", &fsd, sizeof (struct statfs)));
-}],
-fu_cv_sys_stat_statfs3_osf1=yes,
-fu_cv_sys_stat_statfs3_osf1=no,
-fu_cv_sys_stat_statfs3_osf1=no)])
-AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
-if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
-space=yes
-AC_DEFINE(STAT_STATFS3_OSF1)
-fi
-fi
-
-if test $space = no; then
-# AIX
-AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
-member (AIX, 4.3BSD)])
-AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize,
-[AC_TRY_RUN([
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_VFS_H
-#include <sys/vfs.h>
-#endif
-int main ()
-{
-struct statfs fsd;
-fsd.f_bsize = 0;
-return (statfs (".", &fsd));
-}],
-fu_cv_sys_stat_statfs2_bsize=yes,
-fu_cv_sys_stat_statfs2_bsize=no,
-fu_cv_sys_stat_statfs2_bsize=no)])
-AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
-if test $fu_cv_sys_stat_statfs2_bsize = yes; then
-space=yes
-AC_DEFINE(STAT_STATFS2_BSIZE)
-fi
-fi
-
-if test $space = no; then
-# SVR3
-AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
-AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
-[AC_TRY_RUN([#include <sys/types.h>
-#include <sys/statfs.h>
-int main ()
-{
-struct statfs fsd;
-return (statfs (".", &fsd, sizeof fsd, 0));
-}],
-fu_cv_sys_stat_statfs4=yes,
-fu_cv_sys_stat_statfs4=no,
-fu_cv_sys_stat_statfs4=no)])
-AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
-if test $fu_cv_sys_stat_statfs4 = yes; then
-space=yes
-AC_DEFINE(STAT_STATFS4)
-fi
-fi
-
-if test $space = no; then
-# 4.4BSD and NetBSD
-AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
-member (4.4BSD and NetBSD)])
-AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize,
-[AC_TRY_RUN([#include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-int main ()
-{
-struct statfs fsd;
-fsd.f_fsize = 0;
-return (statfs (".", &fsd));
-}],
-fu_cv_sys_stat_statfs2_fsize=yes,
-fu_cv_sys_stat_statfs2_fsize=no,
-fu_cv_sys_stat_statfs2_fsize=no)])
-AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
-if test $fu_cv_sys_stat_statfs2_fsize = yes; then
-space=yes
-AC_DEFINE(STAT_STATFS2_FSIZE)
-fi
-fi
-
-if test $space = no; then
-# Ultrix
-AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)])
-AC_CACHE_VAL(fu_cv_sys_stat_fs_data,
-[AC_TRY_RUN([#include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_FS_TYPES_H
-#include <sys/fs_types.h>
-#endif
-int main ()
-{
-struct fs_data fsd;
-/* Ultrix's statfs returns 1 for success,
-0 for not mounted, -1 for failure.  */
-return (statfs (".", &fsd) != 1);
-}],
-fu_cv_sys_stat_fs_data=yes,
-fu_cv_sys_stat_fs_data=no,
-fu_cv_sys_stat_fs_data=no)])
-AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
-if test $fu_cv_sys_stat_fs_data = yes; then
-space=yes
-AC_DEFINE(STAT_STATFS2_FS_DATA)
-fi
-fi
-
-if test $space = no; then
-# SVR2
-AC_TRY_CPP([#include <sys/filsys.h>],
-AC_DEFINE(STAT_READ_FILSYS) space=yes)
-fi
-
-if test -n "$list_mounted_fs" && test $space != no; then
-DF_PROG="df"
-# LIBOBJS="$LIBOBJS fsusage.o"
-# LIBOBJS="$LIBOBJS mountlist.o"
-fi
-
-# Check for SunOS statfs brokenness wrt partitions 2GB and larger.
-# If <sys/vfs.h> exists and struct statfs has a member named f_spare,
-# enable the work-around code in fsusage.c.
-AC_MSG_CHECKING([for statfs that truncates block counts])
-AC_CACHE_VAL(fu_cv_sys_truncating_statfs,
-[AC_TRY_COMPILE([
-#if !defined(sun) && !defined(__sun)
-choke -- this is a workaround for a Sun-specific problem
-#endif
-#include <sys/types.h>
-#include <sys/vfs.h>],
-[struct statfs t; long c = *(t.f_spare);],
-fu_cv_sys_truncating_statfs=yes,
-fu_cv_sys_truncating_statfs=no,
-)])
-if test $fu_cv_sys_truncating_statfs = yes; then
-AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS)
-fi
-AC_MSG_RESULT($fu_cv_sys_truncating_statfs)
-
-AC_CHECKING(for AFS)
-test -d /afs && AC_DEFINE(AFS)
-])
diff --git a/bacula/autoconf/gnome-macros/gnome-ghttp-check.m4 b/bacula/autoconf/gnome-macros/gnome-ghttp-check.m4
deleted file mode 100644
index 0ecacaa..0000000
--- a/bacula/autoconf/gnome-macros/gnome-ghttp-check.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-AC_DEFUN([GNOME_GHTTP_CHECK],[
-	AC_REQUIRE([GNOME_INIT_HOOK])
-	GHTTP_LIB=
-	AC_CHECK_FUNC(connect,,[
-	  AC_CHECK_LIB(socket,connect,
-		GHTTP_LIB="-lsocket $GHTTP_LIB",,$GHTTP_LIB)])
-	AC_CHECK_FUNC(gethostbyname,,[
- 	  AC_CHECK_LIB(nsl,gethostbyname,
-		GHTTP_LIB="-lnsl $GHTTP_LIB",,$GHTTP_LIB)])
-	AC_CHECK_LIB(ghttp, ghttp_request_new, 
-		GHTTP_LIB="-lghttp $GHTTP_LIB",GHTTP_LIB="",-L$gnome_prefix $GHTTP_LIB)
-	AC_SUBST(GHTTP_LIB)
-	AC_PROVIDE([GNOME_GHTTP_CHECK])
-])
diff --git a/bacula/autoconf/gnome-macros/gnome-gnorba-check.m4 b/bacula/autoconf/gnome-macros/gnome-gnorba-check.m4
deleted file mode 100644
index dbac0a6..0000000
--- a/bacula/autoconf/gnome-macros/gnome-gnorba-check.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-dnl
-dnl GNOME_GNORBA_HOOK (script-if-gnorba-found, failflag)
-dnl
-dnl if failflag is "failure" it aborts if gnorba is not found.
-dnl
-
-AC_DEFUN([GNOME_GNORBA_HOOK],[
-	GNOME_ORBIT_HOOK([],$2)
-	AC_CACHE_CHECK([for gnorba libraries],gnome_cv_gnorba_found,[
-		gnome_cv_gnorba_found=no
-		if test x$gnome_cv_orbit_found = xyes; then
-			GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
-			GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-			if test -n "$GNORBA_LIBS"; then
-				gnome_cv_gnorba_found=yes
-			fi
-		fi
-	])
-	AM_CONDITIONAL(HAVE_GNORBA, test x$gnome_cv_gnorba_found = xyes)
-	if test x$gnome_cv_orbit_found = xyes; then
-		$1
-		GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
-		GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-		AC_SUBST(GNORBA_CFLAGS)
-		AC_SUBST(GNORBA_LIBS)
-	else
-	    	if test x$2 = xfailure; then
-			AC_MSG_ERROR(gnorba library not installed or installation problem)
-	    	fi
-	fi
-])
-
-AC_DEFUN([GNOME_GNORBA_CHECK], [
-	GNOME_GNORBA_HOOK([],failure)
-])
diff --git a/bacula/autoconf/gnome-macros/gnome-guile-checks.m4 b/bacula/autoconf/gnome-macros/gnome-guile-checks.m4
deleted file mode 100644
index 102351c..0000000
--- a/bacula/autoconf/gnome-macros/gnome-guile-checks.m4
+++ /dev/null
@@ -1,134 +0,0 @@
-dnl
-dnl GNOME_CHECK_GUILE (failflag)
-dnl
-dnl if failflag is "fail" then GNOME_CHECK_GUILE will abort if guile is not found.
-dnl
-
-AC_DEFUN([GNOME_CHECK_GUILE],
-[
-dnl	AC_MSG_WARN([Withval is: $withval])
-	guile_msg = 'Huh?'
-if test x$withval = xno ; then
-	guile_msg = 'disabled'
-	GUILE_LIBS=
-	GUILE_INCS=
-	AC_SUBST(GUILE_LIBS)
-	AC_SUBST(GUILE_INCS)
-	AM_CONDITIONAL(GUILE, /bin/false)
-else
-	guile_msg="no"
-
-	saved_ldflags="$LDFLAGS"
-	saved_cppflags="$CPPFLAGS"
-	LDFLAGS="$LDFLAGS $GNOME_LIBDIR"
-
-	AC_CHECK_LIB(qthreads,qt_null,[
-		QTTHREADS_LIB="-lqthreads"
-	],[
-		AC_CHECK_LIB(qt, qt_null, QTTHREADS_LIB="-lqt")
-	],$LIBS)
-	AC_SUBST(QTTHREADS_LIB)
-
-	AC_CHECK_LIB(termcap,main,TERMCAP_LIB="-ltermcap")
-	AC_CHECK_LIB(readline,main,READLINE_LIB="-lreadline",,$TERMCAP_LIB)
-
-	AC_SUBST(TERMCAP_LIB)
-	AC_SUBST(READLINE_LIB)
-
-	if test "x$cross_compiling" = "xyes" ; then
-	  name_build_guile="$target_alias-guile-config"
-	else
-	  name_build_guile="guile-config"
-	fi
-
-	AC_CHECK_PROG(BUILD_GUILE, $name_build_guile, yes, no)
-
-	if test "x$BUILD_GUILE" = "xyes"; then
-	    AC_MSG_CHECKING(whether $name_build_guile works)
-	    if test x`$name_build_guile --version >/dev/null 2>&1 || \
-		echo no` = xno; then
-		BUILD_GUILE=no
-	    fi
-	    AC_MSG_RESULT($BUILD_GUILE)
-	else
-
-	    if test "x$cross_compiling" = "xyes" ; then
-		name_build_guile="$target_alias-build-guile"
-	    else	
-		name_build_guile="build-guile"
-	    fi
-
-	    AC_CHECK_PROG(BUILD_GUILE, $name_build_guile, yes, no)
-
-	    if test "x$BUILD_GUILE" = "xyes"; then
-		AC_MSG_CHECKING(whether $name_build_guile works)
-		if test x`$name_build_guile --version >/dev/null 2>&1 || \
-	 	    echo no` = xno; then
-		    BUILD_GUILE=no
-		fi
-		AC_MSG_RESULT($BUILD_GUILE)
-	    fi
-	fi
-
-	AC_CHECK_LIB(m, sin)
-
-	if test "x$BUILD_GUILE" = "xyes"; then
-		AC_MSG_CHECKING(for guile libraries)
-		GUILE_LIBS="`$name_build_guile link`"
-		AC_MSG_RESULT($GUILE_LIBS)
-		AC_MSG_CHECKING(for guile headers)
-		GUILE_INCS="`$name_build_guile compile`"
-		AC_MSG_RESULT($GUILE_INCS)
-	else
-		GUILE_LIBS="$GNOME_LIBDIR"
-		GUILE_INCS="$GNOME_INCLUDEDIR"
-		AC_CHECK_LIB(rx, main, GUILE_LIBS="-lrx $GUILE_LIBS")
-		AC_CHECK_LIB(qt, qt_null, GUILE_LIBS="-lqt $GUILE_LIBS")
-		AC_CHECK_LIB(dl, dlopen, GUILE_LIBS="-ldl $GUILE_LIBS")
-		AC_CHECK_LIB(nsl, t_accept, GUILE_LIBS="$GUILE_LIBS -lnsl")
-		AC_CHECK_LIB(socket, socket, GUILE_LIBS="$GUILE_LIBS -lsocket")
-		GUILE_LIBS="-lguile $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB"
-	fi
-
-	AC_SUBST(GUILE_LIBS)
-	AC_SUBST(GUILE_INCS)
-
-	saved_LIBS="$LIBS"
-	LIBS="$LIBS $GUILE_LIBS"
-	CPPFLAGS="$saved_cppflags $GUILE_INCS"
-
-	AC_MSG_CHECKING(whether guile works)
-	AC_TRY_LINK([
-		#include <libguile.h>
-		#include <guile/gh.h>
-	],[
-		gh_eval_str("(newline)");
-		scm_boot_guile(0,NULL,NULL,NULL);
-	],[
-		ac_cv_guile_found=yes
-		AC_DEFINE(HAVE_GUILE)
-	],[
-		ac_cv_guile_found=no
-	])
-	AC_MSG_RESULT($ac_cv_guile_found)
-
-	guile_msg=$ac_cv_guile_found
-
-	if test x$ac_cv_guile_found = xno ; then
-		if test x$1 = xfail ; then
-		  AC_MSG_ERROR(Can not find Guile on this system)
-		else
-		  AC_MSG_WARN(Can not find Guile on this system)
-		fi
-		ac_cv_guile_found=no
-		GUILE_LIBS= GUILE_INCS=
-	fi
-
-	LIBS="$saved_LIBS"
-	LDFLAGS="$saved_ldflags"
-	CPPFLAGS="$saved_cppflags"
-
-	AC_SUBST(GUILE_LIBS)
-	AM_CONDITIONAL(GUILE, test x$ac_cv_guile_found = xyes)
-fi
-])
diff --git a/bacula/autoconf/gnome-macros/gnome-libgtop-check.m4 b/bacula/autoconf/gnome-macros/gnome-libgtop-check.m4
deleted file mode 100644
index 1b4e174..0000000
--- a/bacula/autoconf/gnome-macros/gnome-libgtop-check.m4
+++ /dev/null
@@ -1,217 +0,0 @@
-dnl
-dnl LIBGTOP_CHECK_TYPE
-dnl
-dnl Improved version of AC_CHECK_TYPE which takes into account
-dnl that we need to #include some other header files on some
-dnl systems to get some types.
-
-dnl AC_LIBGTOP_CHECK_TYPE(TYPE, DEFAULT)
-AC_DEFUN([AC_LIBGTOP_CHECK_TYPE],
-[AC_REQUIRE([AC_HEADER_STDC])dnl
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(ac_cv_type_$1,
-[AC_EGREP_CPP(dnl
-changequote(<<,>>)dnl
-<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl
-changequote([,]), [#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-
-/* For Tru64 */
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
-AC_MSG_RESULT($ac_cv_type_$1)
-if test $ac_cv_type_$1 = no; then
-  AC_DEFINE($1, $2)
-fi
-])
-
-dnl
-dnl GNOME_LIBGTOP_TYPES
-dnl
-dnl some typechecks for libgtop.
-dnl
-
-AC_DEFUN([GNOME_LIBGTOP_TYPES],
-[
-	AC_CHECK_HEADERS(sys/bitypes.h)
-	AC_LIBGTOP_CHECK_TYPE(u_int64_t, unsigned long long int)
-	AC_LIBGTOP_CHECK_TYPE(int64_t, signed long long int)
-])
-
-dnl
-dnl GNOME_LIBGTOP_HOOK (minversion, script-if-libgtop-enabled, failflag)
-dnl
-dnl if failflag is "fail" then GNOME_LIBGTOP_HOOK will abort if LibGTop
-dnl is not found. 
-dnl
-
-AC_DEFUN([GNOME_LIBGTOP_HOOK],
-[	
-	AC_REQUIRE([GNOME_LIBGTOP_TYPES])
-
-	AC_SUBST(LIBGTOP_LIBDIR)
-	AC_SUBST(LIBGTOP_INCLUDEDIR)
-	AC_SUBST(LIBGTOP_EXTRA_LIBS)
-	AC_SUBST(LIBGTOP_LIBS)
-	AC_SUBST(LIBGTOP_INCS)
-	AC_SUBST(LIBGTOP_NAMES_LIBS)
-	AC_SUBST(LIBGTOP_NAMES_INCS)
-	AC_SUBST(LIBGTOP_MAJOR_VERSION)
-	AC_SUBST(LIBGTOP_MINOR_VERSION)
-	AC_SUBST(LIBGTOP_MICRO_VERSION)
-	AC_SUBST(LIBGTOP_VERSION)
-	AC_SUBST(LIBGTOP_VERSION_CODE)
-	AC_SUBST(LIBGTOP_SERVER_VERSION)
-	AC_SUBST(LIBGTOP_INTERFACE_AGE)
-	AC_SUBST(LIBGTOP_BINARY_AGE)
-	AC_SUBST(LIBGTOP_BINDIR)
-	AC_SUBST(LIBGTOP_SERVER)
-
-	dnl Get the cflags and libraries from the libgtop-config script
-	dnl
-	AC_ARG_WITH(libgtop,
-	[  --with-libgtop=PFX      Prefix where LIBGTOP is installed (optional)],
-	libgtop_config_prefix="$withval", libgtop_config_prefix="")
-	AC_ARG_WITH(libgtop-exec,
-	[  --with-libgtop-exec=PFX Exec prefix where LIBGTOP is installed (optional)],
-	libgtop_config_exec_prefix="$withval", libgtop_config_exec_prefix="")
-
-	if test x$libgtop_config_exec_prefix != x ; then
-	  libgtop_config_args="$libgtop_config_args --exec-prefix=$libgtop_config_exec_prefix"
-	  if test x${LIBGTOP_CONFIG+set} != xset ; then
-	    LIBGTOP_CONFIG=$libgtop_config_exec_prefix/bin/libgtop-config
-	  fi
-	fi
-	if test x$libgtop_config_prefix != x ; then
-	  libgtop_config_args="$libgtop_config_args --prefix=$libgtop_config_prefix"
-	  if test x${LIBGTOP_CONFIG+set} != xset ; then
-	    LIBGTOP_CONFIG=$libgtop_config_prefix/bin/libgtop-config
-	  fi
-	fi
-
-	AC_PATH_PROG(LIBGTOP_CONFIG, libgtop-config, no)
-	dnl IMPORTANT NOTICE:
-	dnl   If you increase this number here, this means that *ALL*
-	dnl   modules will require the new version, even if they explicitly
-	dnl   give a lower number in their `configure.in' !!!
-	real_min_libgtop_version=1.0.0
-	min_libgtop_version=ifelse([$1], ,$real_min_libgtop_version,$1)
-	dnl I know, the following code looks really ugly, but if you want
-	dnl to make changes, please test it with a brain-dead /bin/sh and
-	dnl with a brain-dead /bin/test (not all shells/tests support the
-	dnl `<' operator to compare strings, that's why I convert everything
-	dnl into numbers and test them).
-	min_libgtop_major=`echo $min_libgtop_version | \
-	  sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-	min_libgtop_minor=`echo $min_libgtop_version | \
-	  sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-	min_libgtop_micro=`echo $min_libgtop_version | \
-	  sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-	test x$min_libgtop_micro = x && min_libgtop_micro=0
-	real_min_libgtop_major=`echo $real_min_libgtop_version | \
-	  sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-	real_min_libgtop_minor=`echo $real_min_libgtop_version | \
-	  sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-	real_min_libgtop_micro=`echo $real_min_libgtop_version | \
-	  sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-	test x$real_min_libgtop_micro = x && real_min_libgtop_micro=0
-	dnl You cannot require a version less then $real_min_libgtop_version,
-	dnl so you don't need to update each `configure.in' when it's increased.
-	if test $real_min_libgtop_major -gt $min_libgtop_major ; then
-	  min_libgtop_major=$real_min_libgtop_major
-	  min_libgtop_minor=$real_min_libgtop_minor
-	  min_libgtop_micro=$real_min_libgtop_micro
-	elif test $real_min_libgtop_major = $min_libgtop_major ; then
-	  if test $real_min_libgtop_minor -gt $min_libgtop_minor ; then
-	    min_libgtop_minor=$real_min_libgtop_minor
-	    min_libgtop_micro=$real_min_libgtop_micro
-	  elif test $real_min_libgtop_minor = $min_libgtop_minor ; then
-	    if test $real_min_libgtop_micro -gt $min_libgtop_micro ; then
-	      min_libgtop_micro=$real_min_libgtop_micro
-	    fi
-	  fi
-	fi
-	min_libgtop_version="$min_libgtop_major.$min_libgtop_minor.$min_libgtop_micro"
-	AC_MSG_CHECKING(for libgtop - version >= $min_libgtop_version)
-	no_libgtop=""
-	if test "$LIBGTOP_CONFIG" = "no" ; then
-	  no_libgtop=yes
-	else
-	  configfile=`$LIBGTOP_CONFIG --config`
-	  libgtop_major_version=`$LIBGTOP_CONFIG --version | \
-	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-	  libgtop_minor_version=`$LIBGTOP_CONFIG --version | \
-	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-	  libgtop_micro_version=`$LIBGTOP_CONFIG --version | \
-	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-	  if test $libgtop_major_version != $min_libgtop_major ; then 
-	    no_libgtop=mismatch
-	  else 
- 	    test $libgtop_minor_version -lt $min_libgtop_minor && no_libgtop=yes
-	    if test $libgtop_minor_version = $min_libgtop_minor ; then
-	      test $libgtop_micro_version -lt $min_libgtop_micro && no_libgtop=yes
-	    fi
-	  fi
-	  . $configfile
-	fi
-	if test x$no_libgtop = x ; then
-	  AC_DEFINE(HAVE_LIBGTOP)
-	  AC_DEFINE_UNQUOTED(LIBGTOP_VERSION, "$LIBGTOP_VERSION")
-	  AC_DEFINE_UNQUOTED(LIBGTOP_VERSION_CODE, $LIBGTOP_VERSION_CODE)
-	  AC_DEFINE_UNQUOTED(LIBGTOP_MAJOR_VERSION, $LIBGTOP_MAJOR_VERSION)
-	  AC_DEFINE_UNQUOTED(LIBGTOP_MINOR_VERSION, $LIBGTOP_MINOR_VERSION)
-	  AC_DEFINE_UNQUOTED(LIBGTOP_MICRO_VERSION, $LIBGTOP_MICRO_VERSION)
-	  AC_DEFINE_UNQUOTED(LIBGTOP_SERVER_VERSION, $LIBGTOP_SERVER_VERSION)
-	  AC_MSG_RESULT(yes)
-	  dnl Note that an empty true branch is not valid sh syntax.
-	  ifelse([$2], [], :, [$2])
-	else
-	  AC_MSG_RESULT(no)
-	  if test "$no_libgtop"x = mismatchx; then
-	    AC_MSG_ERROR(LibGTop major version mismatch $libgtop_major_version != $min_libgtop_major)
-	  fi
-	  if test "x$3" = "xfail"; then
-	    AC_MSG_ERROR(LibGTop >= $min_libgtop_version not found)
-	  else
-	    AC_MSG_WARN(LibGTop >= $min_libgtop_version not found)
-	  fi
-	fi
-
-	AM_CONDITIONAL(HAVE_LIBGTOP, test x$no_libgtop != xyes)
-])
-
-AC_DEFUN([GNOME_INIT_LIBGTOP],[
-	GNOME_LIBGTOP_HOOK($1,[ifelse([$3], [], :, [$3])],$2)
-])
-
-dnl
-dnl GNOME_LIBGTOP_DOCU
-dnl
-dnl checks whether the documentation of LibGTop is installed
-dnl
-
-AC_DEFUN([GNOME_LIBGTOP_DOCU],
-[
-	AC_REQUIRE([GNOME_LIBGTOP_HOOK])
-
-	helpdir="$LIBGTOP_DATADIR/gnome/help/libgtop"
-
-	AC_MSG_CHECKING(whether you have the LibGTop Documentation)
-
-	if test -f "$helpdir/C/topic.dat" ; then
-	  have_libgtop_docu=yes
-	  AC_DEFINE(HAVE_LIBGTOP_DOCU)
-	else
-	  have_libgtop_docu=no
-	fi
-
-	AC_MSG_RESULT($have_libgtop_docu)
-
-	AM_CONDITIONAL(HAVE_LIBGTOP_DOCU, test x$have_libgtop_docu = xyes)
-])
-
diff --git a/bacula/autoconf/gnome-macros/gnome-objc-checks.m4 b/bacula/autoconf/gnome-macros/gnome-objc-checks.m4
deleted file mode 100644
index c69acb0..0000000
--- a/bacula/autoconf/gnome-macros/gnome-objc-checks.m4
+++ /dev/null
@@ -1,83 +0,0 @@
-AC_DEFUN([GNOME_CHECK_OBJC],
-[
-dnl Look for an ObjC compiler.
-dnl FIXME: extend list of possible names of ObjC compilers.
-  AC_CHECK_PROGS(OBJC, $OBJC egcs, "")
-  if test "x$OBJC" = "x" ; then
-    AC_CHECK_PROGS(OBJC, $OBJC egcc, "")
-    if test "x$OBJC" = "x" ; then
-      AC_CHECK_PROGS(OBJC, $OBJC gcc, "")
-    fi
-  fi
-
-  AC_REQUIRE([GNOME_PTHREAD_CHECK])
-
-  OBJC_LIBS="-lobjc $PTHREAD_LIB"
-  AC_CHECK_FUNC(sched_yield,,[
-    AC_CHECK_LIB(rt,sched_yield,
-      OBJC_LIBS="$OBJC_LIBS -lrt",[
-      AC_CHECK_LIB(posix4,sched_yield,
-        OBJC_LIBS="$OBJC_LIBS -lposix4",, 
-        $OBJC_LIBS)],
-      $OBJC_LIBS)])
-  AC_SUBST(OBJC_LIBS)
-
-  AC_CACHE_CHECK([if Objective C compiler ($OBJC) works],
-		 ac_cv_prog_objc_works, [
-    if test -n "$OBJC"; then
-      cat > conftest.m <<EOF
-#include <objc/Object.h>
-@interface myRandomObj : Object
-{
-}
-@end
-@implementation myRandomObj
-@end
-int main () {
-  /* No, you are not seeing double.  Remember that square brackets
-     are the autoconf m4 quotes.  */
-  id myid = [[myRandomObj alloc]];
-  [[myid free]];
-  return 0;
-}
-EOF
-
-      $OBJC $CFLAGS -o conftest $LDFLAGS conftest.m $OBJC_LIBS 1>&AC_FD_CC 2>&1
-      result=$?
-      rm -f conftest*
-
-      if test $result -eq 0; then
-        ac_cv_prog_objc_works=yes
-      fi
-    else
-      ac_cv_prog_objc_works=no
-    fi
-  ])
-
-  AM_CONDITIONAL(OBJECTIVE_C, test x$ac_cv_prog_objc_works = xyes)
-  dnl Also set the shell variable OBJECTIVE_C to "yes" or "no".
-  OBJECTIVE_C=$ac_cv_prog_objc_works
-])
-
-AC_DEFUN([GNOME_INIT_OBJC],
-[
-	AC_MSG_CHECKING(for an obGnomeConf.sh)
-	my_gnome_libdir=`$GNOME_CONFIG --libdir`
-	if test -f $my_gnome_libdir/obGnomeConf.sh; then
-	    . $my_gnome_libdir/obGnomeConf.sh
-	    AC_MSG_RESULT(found $my_gnome_libdir)
-	    ac_cv_have_gnome_objc=yes
-	else
-	    AC_MSG_RESULT(not found)
-	    AC_MSG_WARN(Could not find the obGnomeConf.sh file that is generated by gnome-objc install)
-	    ac_cv_have_gnome_objc=no
-	fi
-	
-	dnl Add a conditional on whether or not we have gnome-objc
-	AM_CONDITIONAL(HAVE_GNOME_OBJC, test x$ac_cv_have_gnome_objc = xyes)
-	HAVE_GNOME_OBJC=$ac_cv_have_gnome_objc
-
-	AC_SUBST(OBGNOME_INCLUDEDIR)
-	AC_SUBST(OBGNOME_LIBS)
-	AC_SUBST(OBGTK_LIBS)
-])
diff --git a/bacula/autoconf/gnome-macros/gnome-orbit-check.m4 b/bacula/autoconf/gnome-macros/gnome-orbit-check.m4
deleted file mode 100644
index 54bf33a..0000000
--- a/bacula/autoconf/gnome-macros/gnome-orbit-check.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-dnl
-dnl GNOME_ORBIT_HOOK (script-if-orbit-found, failflag)
-dnl
-dnl if failflag is "failure" it aborts if orbit is not found.
-dnl
-
-AC_DEFUN([GNOME_ORBIT_HOOK],[
-	AC_PATH_PROG(ORBIT_CONFIG,orbit-config,no)
-	AC_PATH_PROG(ORBIT_IDL,orbit-idl,no)
-	AC_CACHE_CHECK([for working ORBit environment],gnome_cv_orbit_found,[
-		if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then
-			gnome_cv_orbit_found=no
-		else
-			gnome_cv_orbit_found=yes
-		fi
-	])
-	AM_CONDITIONAL(HAVE_ORBIT, test x$gnome_cv_orbit_found = xyes)
-	if test x$gnome_cv_orbit_found = xyes; then
-		$1
-		ORBIT_CFLAGS=`orbit-config --cflags client server`
-		ORBIT_LIBS=`orbit-config --use-service=name --libs client server`
-		AC_SUBST(ORBIT_CFLAGS)
-		AC_SUBST(ORBIT_LIBS)
-	else
-    		if test x$2 = xfailure; then
-			AC_MSG_ERROR(ORBit not installed or installation problem)
-    		fi
-	fi
-])
-
-AC_DEFUN([GNOME_ORBIT_CHECK], [
-	GNOME_ORBIT_HOOK([],failure)
-])
diff --git a/bacula/autoconf/gnome-macros/gnome-print-check.m4 b/bacula/autoconf/gnome-macros/gnome-print-check.m4
deleted file mode 100644
index 968fcc0..0000000
--- a/bacula/autoconf/gnome-macros/gnome-print-check.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-# Configure paths for GNOME-PRINT
-# Chris Lahey	99-2-5
-# stolen from Manish Singh again
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_GNOME_PRINT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for GNOME-PRINT, and define GNOME_PRINT_CFLAGS and GNOME_PRINT_LIBS
-dnl
-AC_DEFUN([AM_PATH_GNOME_PRINT],
-[
-  min_version=ifelse([$1],,0.21,$1)
-
-  gnome_print_ok=""
-
-  AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
-  if test "$GNOME_CONFIG" = "no" ; then
-    AC_MSG_RESULT(gnome-config is missing, check your gnome installation)
-  else
-    AC_MSG_CHECKING(for GNOME-PRINT - version >= $min_version)
-    if `$GNOME_CONFIG --libs print > /dev/null 2>&1`; then
-      rqmajor=`echo "$min_version" | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-      rqminor=`echo "$min_version" | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-      major=`$GNOME_CONFIG --modversion print | sed -e 's/gnome-print-//' | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-      minor=`$GNOME_CONFIG --modversion print | sed -e 's/gnome-print-//' | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-      if test "$major" -ge "$rqmajor"; then
-        if test "$major" -gt "$rqmajor"; then
-          AC_MSG_RESULT("found $major.$minor")
-          gnome_print_ok="yes"
-        else
-          if test "$minor" -ge "$rqminor"; then
-            AC_MSG_RESULT("found $major.$minor")
-            gnome_print_ok="yes"
-          else
-            AC_MSG_RESULT("you have $major.$minor")
-          fi
-        fi
-      else
-        AC_MSG_RESULT("you have $major.$minor")
-      fi
-    else
-      AC_MSG_RESULT("did not find any version")
-    fi
-  fi
-
-  if test "x$gnome_print_ok" != "x" ; then
-    GNOME_PRINT_CFLAGS=`$GNOME_CONFIG --cflags print`
-    GNOME_PRINT_LIBS=`$GNOME_CONFIG --libs print`
-    ifelse([$2], , :, [$2])
-  else
-     GNOME_PRINT_CFLAGS=""
-     GNOME_PRINT_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-
-  AC_SUBST(GNOME_PRINT_CFLAGS)
-  AC_SUBST(GNOME_PRINT_LIBS)
-])
-
-AC_DEFUN([GNOME_PRINT_CHECK], [
-	AM_PATH_GNOME_PRINT($1,,[AC_MSG_ERROR(GNOME-PRINT not found or wrong version)])
-])
diff --git a/bacula/autoconf/gnome-macros/gnome-pthread-check.m4 b/bacula/autoconf/gnome-macros/gnome-pthread-check.m4
deleted file mode 100644
index 5a1afee..0000000
--- a/bacula/autoconf/gnome-macros/gnome-pthread-check.m4
+++ /dev/null
@@ -1,18 +0,0 @@
-dnl
-dnl And better, use gthreads instead...
-dnl
-
-AC_DEFUN([GNOME_PTHREAD_CHECK],[
-	PTHREAD_LIB=""
-	AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread",
-		[AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads",
-		    [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r",
-			[AC_CHECK_LIB(pthread, __pthread_attr_init_system, PTHREAD_LIB="-lpthread",
-				[AC_CHECK_FUNC(pthread_create)]
-			)]
-		    )]
-		)]
-	)
-	AC_SUBST(PTHREAD_LIB)
-	AC_PROVIDE([GNOME_PTHREAD_CHECK])
-])
diff --git a/bacula/autoconf/gnome-macros/gnome-support.m4 b/bacula/autoconf/gnome-macros/gnome-support.m4
deleted file mode 100644
index 2c1d049..0000000
--- a/bacula/autoconf/gnome-macros/gnome-support.m4
+++ /dev/null
@@ -1,68 +0,0 @@
-dnl GNOME_SUPPORT_CHECKS
-dnl    Check for various support functions needed by the standard
-dnl    Gnome libraries.  Sets LIBOBJS, might define some macros.
-dnl    This should only be used when building the Gnome libs; 
-dnl    Gnome clients should not need this macro.
-AC_DEFUN([GNOME_SUPPORT_CHECKS],[
-  # we need an `awk' to build `gnomesupport.h'
-  AC_REQUIRE([AC_PROG_AWK])
-
-  # this should go away soon
-  need_gnome_support=yes
-
-  save_LIBOBJS="$LIBOBJS"
-  LIBOBJS=
-
-  AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o")
-
-  # for `scandir'
-  AC_HEADER_DIRENT
-
-  # copied from `configure.in' of `libiberty'
-  vars="program_invocation_short_name program_invocation_name sys_errlist"
-  for v in $vars; do
-    AC_MSG_CHECKING([for $v])
-    AC_CACHE_VAL(gnome_cv_var_$v,
-      [AC_TRY_LINK([int *p;], [extern int $v; p = &$v;],
-		   [eval "gnome_cv_var_$v=yes"],
-		   [eval "gnome_cv_var_$v=no"])])
-    if eval "test \"`echo '$gnome_cv_var_'$v`\" = yes"; then
-      AC_MSG_RESULT(yes)
-      n=HAVE_`echo $v | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      AC_DEFINE_UNQUOTED($n)
-    else
-      AC_MSG_RESULT(no)
-    fi
-  done
-
-  AC_REPLACE_FUNCS(memmove mkstemp scandir strcasecmp strerror strndup strnlen)
-  AC_REPLACE_FUNCS(strtok_r strtod strtol strtoul vasprintf vsnprintf)
-
-  AC_CHECK_FUNCS(realpath,,LIBOBJS="$LIBOBJS canonicalize.o")
-
-  # to include `error.c' error.c has some HAVE_* checks
-  AC_CHECK_FUNCS(vprintf doprnt strerror_r)
-  AM_FUNC_ERROR_AT_LINE
-
-  # This is required if we declare setreuid () and setregid ().
-  AC_TYPE_UID_T
-
-  # see if we need to declare some functions.  Solaris is notorious for
-  # putting functions into the `libc' but not listing them in the headers
-  AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h dirent.h)
-  GCC_NEED_DECLARATIONS(gethostname setreuid setregid getpagesize)
-  GCC_NEED_DECLARATION(scandir,[
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-])
-
-  # Turn our LIBOBJS into libtool objects.  This is gross, but it
-  # requires changes to autoconf before it goes away.
-  LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
-  AC_SUBST(need_gnome_support)
-  AC_SUBST(LTLIBOBJS)
-
-  LIBOBJS="$save_LIBOBJS"
-  AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes)
-])
diff --git a/bacula/autoconf/gnome-macros/gnome-undelfs.m4 b/bacula/autoconf/gnome-macros/gnome-undelfs.m4
deleted file mode 100644
index fe031cd..0000000
--- a/bacula/autoconf/gnome-macros/gnome-undelfs.m4
+++ /dev/null
@@ -1,22 +0,0 @@
-dnl GNOME_UNDELFS_CHECKS
-dnl    Check for ext2fs undel support.
-dnl    Set shell variable ext2fs_undel to "yes" if we have it,
-dnl    "no" otherwise.  May define USE_EXT2FSLIB for cpp.
-dnl    Will set EXT2FS_UNDEL_LIBS to required libraries.
-
-AC_DEFUN([GNOME_UNDELFS_CHECKS], [
-  ext2fs_undel=no
-  EXT2FS_UNDEL_LIBS=
-  AC_CHECK_HEADERS(linux/ext2_fs.h)
-  if test x$ac_cv_header_linux_ext2_fs_h = xyes
-  then
-    AC_CHECK_HEADERS(ext2fs/ext2fs.h, , , [#include <stdio.h>
-#include <linux/ext2_fs.h>])
-    if test x$ac_cv_header_ext2fs_ext2fs_h = xyes
-    then
-      AC_DEFINE(USE_EXT2FSLIB)
-      ext2fs_undel=yes
-      EXT2FS_UNDEL_LIBS="-lext2fs -lcom_err"
-    fi
-  fi
-])
diff --git a/bacula/autoconf/gnome-macros/gnome-vfs.m4 b/bacula/autoconf/gnome-macros/gnome-vfs.m4
deleted file mode 100644
index 6dce307..0000000
--- a/bacula/autoconf/gnome-macros/gnome-vfs.m4
+++ /dev/null
@@ -1,126 +0,0 @@
-dnl GNOME_VFS_CHECKS
-dnl   Check for various functions needed by libvfs.
-dnl   This has various effects:
-dnl     Sets GNOME_VFS_LIBS to libraries required
-dnl     Sets termnet  to true or false depending on whether it is required.
-dnl        If yes, defines USE_TERMNET.
-dnl     Sets vfs_flags to "pretty" list of vfs implementations we include.
-dnl     Sets shell variable use_vfs to yes (default, --with-vfs) or
-dnl        "no" (--without-vfs).
-dnl     Calls AC_SUBST(mcserv), which is either empty or "mcserv".
-
-dnl Private define
-AC_DEFUN([GNOME_WITH_VFS],[
-  dnl FIXME: network checks should probably be in their own macro.
-  AC_CHECK_LIB(nsl, t_accept)
-  AC_CHECK_LIB(socket, socket)
-
-  have_socket=no
-  AC_CHECK_FUNCS(socket, have_socket=yes)
-  if test $have_socket = no; then
-    # socket is not in the default libraries.  See if it's in some other.
-    for lib in bsd socket inet; do
-      AC_CHECK_LIB($lib, socket, [
-	  LIBS="$LIBS -l$lib"
-	  have_socket=yes
-	  AC_DEFINE(HAVE_SOCKET)
-	  break])
-    done
-  fi
-
-  have_gethostbyname=no
-  AC_CHECK_FUNC(gethostbyname, have_gethostbyname=yes)
-  if test $have_gethostbyname = no; then
-    # gethostbyname is not in the default libraries.  See if it's in some other.
-    for lib in bsd socket inet; do
-      AC_CHECK_LIB($lib, gethostbyname, [LIBS="$LIBS -l$lib"; have_gethostbyname=yes; break])
-    done
-  fi
-
-  vfs_flags="tarfs"
-  use_net_code=false
-  if test $have_socket = yes; then
-      AC_STRUCT_LINGER
-      AC_CHECK_FUNCS(pmap_set, , [
-	 AC_CHECK_LIB(rpc, pmap_set, [
-	   LIBS="-lrpc $LIBS"
-	  AC_DEFINE(HAVE_PMAP_SET)
-	  ])])
-      AC_CHECK_FUNCS(pmap_getport pmap_getmaps rresvport)
-      dnl add for source routing support setsockopt
-      AC_CHECK_HEADERS(rpc/pmap_clnt.h, , , [
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-					    ])
-      vfs_flags="$vfs_flags, mcfs, ftpfs, fish"
-      use_net_code=true
-  fi
-
-  dnl
-  dnl Samba support
-  dnl
-  smbfs=""
-  SAMBAFILES=""
-  AC_ARG_WITH(samba,
-  	  [--with-samba	            Support smb virtual file system],[
-  	  if test "x$withval" != "xno"; then
-  		  AC_DEFINE(WITH_SMBFS)
-	          vfs_flags="$vfs_flags, smbfs"
-		  smbfs="smbfs.o"
-		  SAMBAFILES="\$(SAMBAFILES)"
-  	  fi
-  ])
-  AC_SUBST(smbfs)
-  AC_SUBST(SAMBAFILES)
-  
-  dnl
-  dnl The termnet support
-  dnl
-  termnet=false
-  AC_ARG_WITH(termnet,
-	  [--with-termnet             If you want a termified net support],[
-	  if test x$withval = xyes; then
-		  AC_DEFINE(USE_TERMNET)
-		  termnet=true		
-	  fi
-  ])
-
-  TERMNET=""
-  AC_DEFINE(USE_VFS)
-  if $use_net_code; then
-     AC_DEFINE(USE_NETCODE)
-  fi
-  mcserv=
-  if test $have_socket = yes; then
-     mcserv="mcserv"
-     if $termnet; then
-	TERMNET="-ltermnet"
-     fi
-  fi
-
-  AC_SUBST(TERMNET)
-  AC_SUBST(mcserv)
-
-dnl FIXME:
-dnl GNOME_VFS_LIBS=
-
-])
-
-AC_DEFUN([GNOME_VFS_CHECKS],[
-	use_vfs=yes
-	AC_ARG_WITH(vfs,
-		[--with-vfs		   Compile with the VFS code],
-		use_vfs=$withval
-	)
-	case $use_vfs in
-		yes) 	GNOME_WITH_VFS;;
-		no) 	use_vfs=no;;
-		*)   	use_vfs=no;;
-			dnl Should we issue a warning?
-	esac
-])
-
-
diff --git a/bacula/autoconf/gnome-macros/gnome-x-checks.m4 b/bacula/autoconf/gnome-macros/gnome-x-checks.m4
deleted file mode 100644
index 1e397ef..0000000
--- a/bacula/autoconf/gnome-macros/gnome-x-checks.m4
+++ /dev/null
@@ -1,80 +0,0 @@
-dnl GNOME_X_CHECKS
-dnl
-dnl Basic X11 related checks for X11.  At the end, the following will be
-dnl defined/changed:
-dnl   GTK_{CFLAGS,LIBS}      From AM_PATH_GTK
-dnl   CPPFLAGS		     Will include $X_CFLAGS
-dnl   GNOME_HAVE_SM	     `true' or `false' depending on whether session
-dnl                          management is available.  It is available if
-dnl                          both -lSM and X11/SM/SMlib.h exist.  (Some
-dnl                          Solaris boxes have the library but not the header)
-dnl   XPM_LIBS               -lXpm if Xpm library is present, otherwise ""
-dnl
-dnl The following configure cache variables are defined (but not used):
-dnl   gnome_cv_passdown_{x_libs,X_LIBS,X_CFLAGS}
-dnl
-AC_DEFUN([GNOME_X_CHECKS],
-[
-	AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(GTK not installed, or gtk-config not in path))
-	dnl Hope that GTK_CFLAGS have only -I and -D.  Otherwise, we could
-	dnl   test -z "$x_includes" || CPPFLAGS="$CPPFLAGS -I$x_includes"
-	dnl
-	dnl Use CPPFLAGS instead of CFLAGS because AC_CHECK_HEADERS uses
-	dnl CPPFLAGS, not CFLAGS
-        CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
-
-        saved_ldflags="$LDFLAGS"
-        LDFLAGS="$LDFLAGS $GTK_LIBS"
-
-	gnome_cv_passdown_x_libs="$GTK_LIBS"
-	gnome_cv_passdown_X_LIBS="$GTK_LIBS"
-	gnome_cv_passdown_X_CFLAGS="$GTK_CFLAGS"
-	gnome_cv_passdown_GTK_LIBS="$GTK_LIBS"
-
-        LDFLAGS="$saved_ldflags $GTK_LIBS"
-
-dnl We are requiring GTK >= 1.1.1, which means this will be fine anyhow.
-	USE_DEVGTK=true
-
-dnl	AC_MSG_CHECKING([whether to use features from (unstable) GTK+ 1.1.x])
-dnl	AC_EGREP_CPP(answer_affirmatively,
-dnl	[#include <gtk/gtkfeatures.h>
-dnl	#ifdef GTK_HAVE_FEATURES_1_1_0
-dnl	   answer_affirmatively
-dnl	#endif
-dnl	], dev_gtk=yes, dev_gtk=no)
-dnl	if test "$dev_gtk" = "yes"; then
-dnl	   USE_DEVGTK=true
-dnl	fi
-dnl	AC_MSG_RESULT("$dev_gtk")
-
-	GNOME_HAVE_SM=true
-	case "$GTK_LIBS" in
-	 *-lSM*)
-	    dnl Already found it.
-	    ;;
-	 *)
-	    dnl Assume that if we have -lSM then we also have -lICE.
-	    AC_CHECK_LIB(SM, SmcSaveYourselfDone,
-	        [GTK_LIBS="-lSM -lICE $GTK_LIBS"],GNOME_HAVE_SM=false,
-		$x_libs -lICE)
-	    ;;
-	esac
-
-	if test "$GNOME_HAVE_SM" = true; then
-	   AC_CHECK_HEADERS(X11/SM/SMlib.h,,GNOME_HAVE_SM=false)
-	fi
-
-	if test "$GNOME_HAVE_SM" = true; then
-	   AC_DEFINE(HAVE_LIBSM)
-	fi
-
-	XPM_LIBS=""
-	AC_CHECK_LIB(Xpm, XpmFreeXpmImage, [XPM_LIBS="-lXpm"], , $x_libs)
-	AC_SUBST(XPM_LIBS)
-
-	AC_REQUIRE([GNOME_PTHREAD_CHECK])
-        LDFLAGS="$saved_ldflags"
-
-	AC_PROVIDE([GNOME_X_CHECKS])
-])
diff --git a/bacula/autoconf/gnome-macros/gnome-xml-check.m4 b/bacula/autoconf/gnome-macros/gnome-xml-check.m4
deleted file mode 100644
index 1caad10..0000000
--- a/bacula/autoconf/gnome-macros/gnome-xml-check.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl
-dnl GNOME_XML_HOOK (script-if-xml-found, failflag)
-dnl
-dnl If failflag is "failure", script aborts due to lack of XML
-dnl 
-dnl Check for availability of the libxml library
-dnl the XML parser uses libz if available too
-dnl
-
-AC_DEFUN([GNOME_XML_HOOK],[
-	AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
-	if test "$GNOME_CONFIG" = no; then
-		if test x$2 = xfailure; then
-			AC_MSG_ERROR(Could not find gnome-config)
-		fi
-	fi
-	GNOME_XML_CFLAGS=`$GNOME_CONFIG --cflags xml`
-	AC_SUBST(GNOME_XML_CFLAGS)
-	AC_CHECK_LIB(xml, xmlNewDoc, [
-		$1
-		GNOME_XML_LIB=`$GNOME_CONFIG --libs xml`
-	], [
-		if test x$2 = xfailure; then 
-			AC_MSG_ERROR(Could not link sample xml program)
-		fi
-	], `$GNOME_CONFIG --libs xml`)
-	AC_SUBST(GNOME_XML_LIB)
-])
-
-AC_DEFUN([GNOME_XML_CHECK], [
-	GNOME_XML_HOOK([],failure)
-])
diff --git a/bacula/autoconf/gnome-macros/gnome.m4 b/bacula/autoconf/gnome-macros/gnome.m4
deleted file mode 100644
index 2d23de8..0000000
--- a/bacula/autoconf/gnome-macros/gnome.m4
+++ /dev/null
@@ -1,130 +0,0 @@
-dnl
-dnl GNOME_INIT_HOOK (script-if-gnome-enabled, [failflag], [additional-inits])
-dnl
-dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh
-dnl is not found. 
-dnl
-
-AC_DEFUN([GNOME_INIT_HOOK],[
-	AC_SUBST(GNOME_LIBS)
-	AC_SUBST(GNOMEUI_LIBS)
-	AC_SUBST(GNOMEGNORBA_LIBS)
-	AC_SUBST(GTKXMHTML_LIBS)
-	AC_SUBST(ZVT_LIBS)
-	AC_SUBST(GNOME_LIBDIR)
-	AC_SUBST(GNOME_INCLUDEDIR)
-
-	AC_ARG_WITH(gnome-includes,
-	[  --with-gnome-includes   Specify location of GNOME headers],[
-	CFLAGS="$CFLAGS -I$withval"
-	])
-	
-	AC_ARG_WITH(gnome-libs,
-	[  --with-gnome-libs       Specify location of GNOME libs],[
-	LDFLAGS="$LDFLAGS -L$withval"
-	gnome_prefix=$withval
-	])
-
-	AC_ARG_WITH(gnome,
-	[  --with-gnome            Specify prefix for GNOME files],
-		if test x$withval = xyes; then
-	    		want_gnome=yes
-	    		dnl Note that an empty true branch is not
-			dnl valid sh syntax.
-	    		ifelse([$1], [], :, [$1])
-        	else
-	    		if test "x$withval" = xno; then
-	        		want_gnome=no
-	    		else
-	        		want_gnome=yes
-	    			LDFLAGS="$LDFLAGS -L$withval/lib"
-	    			CFLAGS="$CFLAGS -I$withval/include"
-	    			gnome_prefix=$withval/lib
-	    		fi
-  		fi,
-		want_gnome=yes)
-
-	if test "x$want_gnome" = xyes; then
-
-	    AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
-	    if test "$GNOME_CONFIG" = "no"; then
-	      no_gnome_config="yes"
-	    else
-	      AC_MSG_CHECKING(if $GNOME_CONFIG works)
-	      if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
-	        AC_MSG_RESULT(yes)
-	        GNOME_GNORBA_HOOK([],$2)
-	        GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`"
-	        GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`"
-	        GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`"
-	        GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`"
-		ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`"
-	        GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`"
-	        GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`"
-                $1
-	      else
-	        AC_MSG_RESULT(no)
-	        no_gnome_config="yes"
-              fi
-            fi
-
-	    if test x$exec_prefix = xNONE; then
-	        if test x$prefix = xNONE; then
-		    gnome_prefix=$ac_default_prefix/lib
-	        else
- 		    gnome_prefix=$prefix/lib
-	        fi
-	    else
-	        gnome_prefix=`eval echo \`echo $libdir\``
-	    fi
-	
-	    if test "$no_gnome_config" = "yes"; then
-              AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix)
-	      if test -f $gnome_prefix/gnomeConf.sh; then
-	        AC_MSG_RESULT(found)
-	        echo "loading gnome configuration from" \
-		     "$gnome_prefix/gnomeConf.sh"
-	        . $gnome_prefix/gnomeConf.sh
-	        $1
-	      else
-	        AC_MSG_RESULT(not found)
- 	        if test x$2 = xfail; then
-	          AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install)
- 	        fi
-	      fi
-            fi
-	fi
-
-	if test -n "$3"; then
-	  n="$3"
-	  for i in $n; do
-	    AC_MSG_CHECKING(extra library \"$i\")
-	    case $i in 
-	      applets)
-		AC_SUBST(GNOME_APPLETS_LIBS)
-		GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets`
-		AC_MSG_RESULT($GNOME_APPLETS_LIBS);;
-	      docklets)
-		AC_SUBST(GNOME_DOCKLETS_LIBS)
-		GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets`
-		AC_MSG_RESULT($GNOME_DOCKLETS_LIBS);;
-	      capplet)
-		AC_SUBST(GNOME_CAPPLET_LIBS)
-		GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet`
-		AC_MSG_RESULT($GNOME_CAPPLET_LIBS);;
-	      *)
-		AC_MSG_RESULT(unknown library)
-	    esac
-            EXTRA_INCLUDEDIR=`$GNOME_CONFIG --cflags $i`
-            GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR $EXTRA_INCLUDEDIR"
-	  done
-	fi
-])
-
-dnl
-dnl GNOME_INIT ([additional-inits])
-dnl
-
-AC_DEFUN([GNOME_INIT],[
-	GNOME_INIT_HOOK([],fail,$1)
-])
diff --git a/bacula/autoconf/gnome-macros/gperf-check.m4 b/bacula/autoconf/gnome-macros/gperf-check.m4
deleted file mode 100644
index 3869459..0000000
--- a/bacula/autoconf/gnome-macros/gperf-check.m4
+++ /dev/null
@@ -1,79 +0,0 @@
-dnl
-dnl AC_PROG_GPERF (MINIMUM-VERSION)
-dnl
-dnl Check for availability of gperf.
-dnl Abort if not found or if current version is not up to par.
-dnl
-
-AC_DEFUN([AC_PROG_GPERF],[
-	AC_PATH_PROG(GPERF, gperf, no)
-	if test "$GPERF" = no; then
-		AC_MSG_ERROR(Could not find gperf)
-	fi
-	min_gperf_version=ifelse([$1], ,2.7,$1)
-	AC_MSG_CHECKING(for gperf - version >= $min_gperf_version)
-	gperf_major_version=`$GPERF --version | \
-		sed 's/GNU gperf \([[0-9]]*\).\([[0-9]]*\)/\1/'`
-	gperf_minor_version=`$GPERF --version | \
-		sed 's/GNU gperf \([[0-9]]*\).\([[0-9]]*\)/\2/'`
-	no_gperf=""
-dnl
-dnl Now check if the installed gperf is sufficiently new.
-dnl
-	AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-static char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int 
-main ()
-{
-  char  *tmp_version;
-  
-  int    major;
-  int    minor;
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_gperf_version");
-  if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) {
-    printf ("%s, bad version string\n", "$min_gperf_version");
-    return 1;
-  }
-
-  if (($gperf_major_version > major) ||
-      (($gperf_major_version == major) && ($gperf_minor_version >= minor))) {
-    return 0;
-  } else {
-    printf ("\n");
-    printf ("*** An old version of gperf ($gperf_major_version.$gperf_minor_version) was found.\n");
-    printf ("*** You need a version of gperf newer than %d.%d.%d.  The latest version of\n",
-	       major, minor);
-    printf ("*** gperf is always available from ftp://ftp.gnu.org.\n");
-    printf ("***\n");
-    return 1;
-  }
-}
-],,no_gperf=yes,[/bin/true])
-	if test "x$no_gperf" = x ; then
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT(no)
-	fi
-
-])
diff --git a/bacula/autoconf/gnome-macros/linger.m4 b/bacula/autoconf/gnome-macros/linger.m4
deleted file mode 100644
index f1c7060..0000000
--- a/bacula/autoconf/gnome-macros/linger.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-dnl
-dnl Check for struct linger
-dnl
-AC_DEFUN([AC_STRUCT_LINGER], [
-av_struct_linger=no
-AC_MSG_CHECKING(struct linger is available)
-AC_TRY_RUN([
-#include <sys/types.h>
-#include <sys/socket.h>
-
-struct linger li;
-
-int main ()
-{
-    li.l_onoff = 1;
-    li.l_linger = 120;
-    return 0;
-}
-],[
-AC_DEFINE(HAVE_STRUCT_LINGER)
-av_struct_linger=yes
-],[
-av_struct_linger=no
-],[
-av_struct_linger=no
-])
-AC_MSG_RESULT($av_struct_linger)
-])
diff --git a/bacula/autoconf/gnome-macros/need-declaration.m4 b/bacula/autoconf/gnome-macros/need-declaration.m4
deleted file mode 100644
index 8a217b8..0000000
--- a/bacula/autoconf/gnome-macros/need-declaration.m4
+++ /dev/null
@@ -1,42 +0,0 @@
-dnl See whether we need a declaration for a function.
-dnl GCC_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES])
-AC_DEFUN([GCC_NEED_DECLARATION],
-[AC_MSG_CHECKING([whether $1 must be declared])
-AC_CACHE_VAL(gcc_cv_decl_needed_$1,
-[AC_TRY_COMPILE([
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-$2],
-[char *(*pfn) = (char *(*)) $1],
-eval "gcc_cv_decl_needed_$1=no", eval "gcc_cv_decl_needed_$1=yes")])
-if eval "test \"`echo '$gcc_cv_decl_needed_'$1`\" = yes"; then
-  AC_MSG_RESULT(yes)
-  gcc_need_declarations="$gcc_need_declarations $1"
-  gcc_tr_decl=NEED_DECLARATION_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  AC_DEFINE_UNQUOTED($gcc_tr_decl)
-else
-  AC_MSG_RESULT(no)
-fi
-])dnl
-
-dnl Check multiple functions to see whether each needs a declaration.
-dnl GCC_NEED_DECLARATIONS(FUNCTION... [, EXTRA-HEADER-FILES])
-AC_DEFUN([GCC_NEED_DECLARATIONS],
-[for ac_func in $1
-do
-GCC_NEED_DECLARATION($ac_func, $2)
-done
-]
-)
diff --git a/bacula/autoconf/who_and_what_of_libtool_patch b/bacula/autoconf/who_and_what_of_libtool_patch
index 3156f59..70eff1e 100644
--- a/bacula/autoconf/who_and_what_of_libtool_patch
+++ b/bacula/autoconf/who_and_what_of_libtool_patch
@@ -111,9 +111,6 @@ Small walk trough of libtool patch (what in there ...)
       - libtool-install and libtool-uninstall target only called when libtool is used
       - install include files when using libtool
 
-- src/gnome2-console/Makefile.in
-   - added support for libtool
-
 - src/lib/Makefile.in
    - added support for libtool
       - use dynamic generation of names of object files
@@ -164,16 +161,6 @@ Small walk trough of libtool patch (what in there ...)
       - updated to use libtool when defined and have depend on correct archive type
       - extra libtool-clean target only called when libtool is used
 
-- src/tray-monitor/Makefile.in
-   - added support for libtool
-      - updated to use libtool when defined and have depend on correct archive type
-      - extra libtool-clean target only called when libtool is used
-
-- src/wx-console/Makefile.in
-   - added support for libtool
-      - updated to use libtool when defined and have depend on correct archive type
-      - extra libtool-clean target only called when libtool is used
-
 Todo:
 
 - check if install of libs and includes also goes nicely when you don't do things like --prefix=/opt/ELMbacula
diff --git a/bacula/examples/conf/defaultconfig b/bacula/examples/conf/defaultconfig
index d3e9053..ca941ab 100755
--- a/bacula/examples/conf/defaultconfig
+++ b/bacula/examples/conf/defaultconfig
@@ -13,7 +13,6 @@ CFLAGS="-g -Wall" \
     --with-pid-dir=$HOME/bacula/bin/working \
     --with-subsys-dir=$HOME/bacula/bin/working \
     --enable-smartalloc \
-    --enable-gnome \
     --enable-static-tools \
     --with-mysql=$HOME/mysql \
     --with-working-dir=$HOME/bacula/bin/working \
diff --git a/bacula/examples/conf/gnome-console.conf b/bacula/examples/conf/gnome-console.conf
deleted file mode 100644
index f5e70f1..0000000
--- a/bacula/examples/conf/gnome-console.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Kern's Production Bacula User Agent Configuration File
-#
-
-Director {
-  Name = HeadMan
-  DIRport = 9101
-  address = "localhost"
-  Password = ""  # Console password
-}
diff --git a/bacula/examples/conf/kernsconfig b/bacula/examples/conf/kernsconfig
index c8edf89..62eca38 100755
--- a/bacula/examples/conf/kernsconfig
+++ b/bacula/examples/conf/kernsconfig
@@ -7,7 +7,6 @@ CFLAGS="-g -O2 -Wall" ./configure \
     --sysconfdir=$HOME/bacula/bin \
     --with-pid-dir=$HOME/bacula/bin/working \
     --with-subsys-dir=$HOME/bacula/bin/working \
-    --enable-gnome \
     --enable-smartalloc \
     --with-mysql=$HOME/mysql \
     --with-working-dir=$HOME/bacula/working \
diff --git a/bacula/examples/nagios/check_bacula/authenticate.c b/bacula/examples/nagios/check_bacula/authenticate.c
index 94937b7..0eb1c8f 100644
--- a/bacula/examples/nagios/check_bacula/authenticate.c
+++ b/bacula/examples/nagios/check_bacula/authenticate.c
@@ -76,7 +76,7 @@ int authenticate_director(BSOCK *dir, char *dirname, char *password)
 
    /* Timeout Hello after 5 mins */
    btimer_t *tid = start_bsock_timer(dir, 60 * 5);
-   bnet_fsend(dir, DIRhello, bashed_name);
+   dir->fsend(DIRhello, bashed_name);
 
    if (!cram_md5_respond(dir, password, &tls_remote_need, &compatible) ||
        !cram_md5_challenge(dir, password, tls_local_need, compatible)) {
@@ -85,7 +85,7 @@ int authenticate_director(BSOCK *dir, char *dirname, char *password)
    }
 
    Dmsg1(6, ">dird: %s", dir->msg);
-   if (bnet_recv(dir) <= 0) {
+   if (dir->recv() <= 0) {
       stop_bsock_timer(tid);
       return 0;
    }
@@ -114,7 +114,7 @@ int authenticate_storage_daemon(BSOCK *sd, char *sdname, char* password)
    bash_spaces(dirname);
    /* Timeout Hello after 5 mins */
    btimer_t *tid = start_bsock_timer(sd, 60 * 5);
-   if (!bnet_fsend(sd, SDFDhello, dirname)) {
+   if (!sd->fsend(SDFDhello, dirname)) {
       stop_bsock_timer(tid);
       return 0;
    }
@@ -124,7 +124,7 @@ int authenticate_storage_daemon(BSOCK *sd, char *sdname, char* password)
       return 0;
    }
    Dmsg1(116, ">stored: %s", sd->msg);
-   if (bnet_recv(sd) <= 0) {
+   if (sd->recv() <= 0) {
       stop_bsock_timer(tid);
       return 0;
    }
@@ -153,7 +153,7 @@ int authenticate_file_daemon(BSOCK *fd, char *fdname, char *password)
    bash_spaces(dirname);
    /* Timeout Hello after 5 mins */
    btimer_t *tid = start_bsock_timer(fd, 60 * 5);
-   if (!bnet_fsend(fd, SDFDhello, dirname)) {
+   if (!fd->fsend(SDFDhello, dirname)) {
       stop_bsock_timer(tid);
       return 0;
    }
@@ -163,7 +163,7 @@ int authenticate_file_daemon(BSOCK *fd, char *fdname, char *password)
       return 0;
    }
    Dmsg1(116, ">filed: %s", fd->msg);
-   if (bnet_recv(fd) <= 0) {
+   if (fd->recv() <= 0) {
       stop_bsock_timer(tid);
       return 0;
    }
diff --git a/bacula/examples/nagios/check_bacula/check_bacula.c b/bacula/examples/nagios/check_bacula/check_bacula.c
index 58d6997..1546da7 100644
--- a/bacula/examples/nagios/check_bacula/check_bacula.c
+++ b/bacula/examples/nagios/check_bacula/check_bacula.c
@@ -2,13 +2,11 @@
  *
  *   Nagios Plugin check_bacula
  *
- *     Christian Masopust, (c)2005
- *
- *     Version $Id: check_bacula.c,v 1.0 2005/02/25
+ *     Christian Masopust, (c)2005-2012
  */
 
 /*
-   Copyright (C) 2005 Christian Masopust
+   Copyright (C) 2005-2012 Christian Masopust
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -73,7 +71,7 @@ static void usage()
 
 /*********************************************************************
  *
- *	   Main Bacula Tray Monitor -- User Interface Program
+ *         Main Bacula Tray Monitor -- User Interface Program
  *
  */
 int main(int argc, char *argv[])
@@ -114,38 +112,38 @@ int main(int argc, char *argv[])
 
       switch (ch) {
 
-		  case 'H':
-		  	strcpy (host, optarg);
-		  	break;
-
-		  case 'D':
-		  	strcpy (daemon, optarg);
-		  	break;
-
-		  case 'M':
-		  	strcpy (monitorname, optarg);
-		  	break;
-
-		  case 'P':
-		  	port = atoi(optarg);
-		  	break;
-
-		  case 'K':
-		  	strcpy (pw, optarg);
-		  	break;
-
-		  case 'd':
-		 	debug_level = atoi(optarg);
-		 	if (debug_level <= 0) {
-		 	   debug_level = 1;
-		 	}
-		 	break;
-
-      	  case 'h':
-      	  case '?':
-      	  default:
-			 usage();
-			 exit(1);
+                  case 'H':
+                        strcpy (host, optarg);
+                        break;
+
+                  case 'D':
+                        strcpy (daemon, optarg);
+                        break;
+
+                  case 'M':
+                        strcpy (monitorname, optarg);
+                        break;
+
+                  case 'P':
+                        port = atoi(optarg);
+                        break;
+
+                  case 'K':
+                        strcpy (pw, optarg);
+                        break;
+
+                  case 'd':
+                        debug_level = atoi(optarg);
+                        if (debug_level <= 0) {
+                           debug_level = 1;
+                        }
+                        break;
+
+          case 'h':
+          case '?':
+          default:
+                         usage();
+                         exit(1);
       }
    }
    argc -= optind;
@@ -171,65 +169,65 @@ int main(int argc, char *argv[])
    /* director ?  */
    if (strcmp (daemon, "dir") == 0) {
 
-	   if (port != 0)
-	   	 s_dird.DIRport = port;
-	   else
-	   	 s_dird.DIRport = 9101;
+           if (port != 0)
+                 s_dird.DIRport = port;
+           else
+                 s_dird.DIRport = 9101;
 
-	   s_dird.address  = host;
-	   s_dird.password = sig;
-	   s_dird.hdr.name = monitorname;
+           s_dird.address  = host;
+           s_dird.password = sig;
+           s_dird.hdr.name = monitorname;
 
-	   mitem.type = R_DIRECTOR;
-	   mitem.resource = &s_dird;
-	   mitem.D_sock = NULL;
+           mitem.type = R_DIRECTOR;
+           mitem.resource = &s_dird;
+           mitem.D_sock = NULL;
 
    } else if (strcmp (daemon, "sd") == 0) {
 
-	   if (port != 0)
-	   	 s_stored.SDport = port;
-	   else
-	   	 s_stored.SDport = 9103;
+           if (port != 0)
+                 s_stored.SDport = port;
+           else
+                 s_stored.SDport = 9103;
 
-	   s_stored.address = host;
-	   s_stored.password = sig;
-	   s_stored.hdr.name = monitorname;
+           s_stored.address = host;
+           s_stored.password = sig;
+           s_stored.hdr.name = monitorname;
 
-	   mitem.type = R_STORAGE;
-	   mitem.resource = &s_stored;
-	   mitem.D_sock = NULL;
+           mitem.type = R_STORAGE;
+           mitem.resource = &s_stored;
+           mitem.D_sock = NULL;
 
    } else if (strcmp (daemon, "fd") == 0) {
 
-	   if (port != 0)
-	   	 s_filed.FDport = port;
-	   else
-	   	 s_filed.FDport = 9102;
+           if (port != 0)
+                 s_filed.FDport = port;
+           else
+                 s_filed.FDport = 9102;
 
-	   s_filed.address = host;
-	   s_filed.password = sig;
-	   s_filed.hdr.name = monitorname;
+           s_filed.address = host;
+           s_filed.password = sig;
+           s_filed.hdr.name = monitorname;
 
-	   mitem.type = R_CLIENT;
-	   mitem.resource = &s_filed;
-	   mitem.D_sock = NULL;
+           mitem.type = R_CLIENT;
+           mitem.resource = &s_filed;
+           mitem.D_sock = NULL;
 
    } else {
 
-	   usage();
-	   exit(1);
+           usage();
+           exit(1);
    }
 
 
    if (mitem.type == R_DIRECTOR)
-	   retcode = docmd(&mitem, ".status dir current\n", answer);
+           retcode = docmd(&mitem, ".status dir current\n", answer);
    else
-	   retcode = docmd(&mitem, ".status current\n", answer);
+           retcode = docmd(&mitem, ".status current\n", answer);
 
 
    if (mitem.D_sock) {
-	 bnet_sig(mitem.D_sock, BNET_TERMINATE); /* send EOF */
-	 bnet_close(mitem.D_sock);
+         mitem.D_sock->signal(BNET_TERMINATE); /* send EOF */
+         mitem.D_sock->close();
    }
 
    printf ("%s\n", answer);
@@ -269,7 +267,7 @@ int docmd(monitoritem* item, const char* command, char *answer) {
    int stat;
    char num;
    const char *dname;
-   
+
    dname = "";
 
    if (!item->D_sock) {
@@ -280,34 +278,37 @@ int docmd(monitoritem* item, const char* command, char *answer) {
 
       switch (item->type) {
       case R_DIRECTOR:
-		 dird = (DIRRES*)item->resource;
-		 item->D_sock = bnet_connect(NULL, 0, 0, 0, "Director daemon", dird->address, NULL, dird->DIRport, 0);
-		 dname = "Director";
-		 break;
+                 dird = (DIRRES*)item->resource;
+                 item->D_sock = new_bsock();
+                 item->D_sock->connect(NULL, 0, 0, 0, "Director daemon", dird->address, NULL, dird->DIRport, 0);
+                 dname = "Director";
+                 break;
       case R_CLIENT:
-		 filed = (CLIENT*)item->resource;
-		 item->D_sock = bnet_connect(NULL, 0, 0, 0, "File daemon", filed->address, NULL, filed->FDport, 0);
-		 dname = "FileDaemon";
-		 break;
+                 filed = (CLIENT*)item->resource;
+                 item->D_sock = new_bsock();
+                 item->D_sock->connect(NULL, 0, 0, 0, "File daemon", filed->address, NULL, filed->FDport, 0);
+                 dname = "FileDaemon";
+                 break;
       case R_STORAGE:
-		 stored = (STORE*)item->resource;
-		 item->D_sock = bnet_connect(NULL, 0, 0, 0, "Storage daemon", stored->address, NULL, stored->SDport, 0);
-		 dname = "StorageDaemon";
-		 break;
+                 stored = (STORE*)item->resource;
+                 item->D_sock = new_bsock();
+                 item->D_sock->connect(NULL, 0, 0, 0, "Storage daemon", stored->address, NULL, stored->SDport, 0);
+                 dname = "StorageDaemon";
+                 break;
       default:
-		 printf("Error, currentitem is not a Client, a Storage or a Director..\n");
-		 return STATE_UNKNOWN;
+                 printf("Error, currentitem is not a Client, a Storage or a Director..\n");
+                 return STATE_UNKNOWN;
       }
 
       if (item->D_sock == NULL) {
-      		 sprintf (answer, "BACULA CRITICAL - Cannot connect to %s!", dname);
-		 return STATE_CRITICAL;
+                 sprintf (answer, "BACULA CRITICAL - Cannot connect to %s!", dname);
+                 return STATE_CRITICAL;
       }
 
       if (!authenticate_daemon(item)) {
-	 	sprintf (answer, "BACULA CRITICAL - Cannot authenticate to %s: %s", dname, item->D_sock->msg);
-	 	item->D_sock = NULL;
-	 	return STATE_CRITICAL;
+                sprintf (answer, "BACULA CRITICAL - Cannot authenticate to %s: %s", dname, item->D_sock->msg);
+                item->D_sock = NULL;
+                return STATE_CRITICAL;
       }
 
    }
@@ -316,46 +317,46 @@ int docmd(monitoritem* item, const char* command, char *answer) {
       writecmd(item, command);
 
    while(1) {
-      if ((stat = bnet_recv(item->D_sock)) >= 0) {
-
-	/* welcome message of director */
-	if ((item->type == R_DIRECTOR) && (strncmp(item->D_sock->msg, "Using ", 6) == 0))
-		continue;
-
-	if (sscanf(item->D_sock->msg, OKqstatus, &num) != 1) {
-		/* Error, couldn't find OK */
-		sprintf (answer, "BACULA CRITICAL - %s Status: %s", dname, item->D_sock->msg);
-		return STATE_CRITICAL;
-	} else {
-		sprintf (answer, "BACULA OK - %s Status OK", dname);
-		return STATE_OK;
-	}
+      if ((stat = item->D_sock->recv()) >= 0) {
+
+        /* welcome message of director */
+        if ((item->type == R_DIRECTOR) && (strncmp(item->D_sock->msg, "Using ", 6) == 0))
+                continue;
+
+        if (sscanf(item->D_sock->msg, OKqstatus, &num) != 1) {
+                /* Error, couldn't find OK */
+                sprintf (answer, "BACULA CRITICAL - %s Status: %s", dname, item->D_sock->msg);
+                return STATE_CRITICAL;
+        } else {
+                sprintf (answer, "BACULA OK - %s Status OK", dname);
+                return STATE_OK;
+        }
       }
       else if (stat == BNET_SIGNAL) {
-	 	if (item->D_sock->msglen == BNET_EOD) {
-	    	strcpy(answer, "BACULA WARNING - << EOD >>");
-	    	return STATE_WARNING;
-	 }
-	 else if (item->D_sock->msglen == BNET_SUB_PROMPT) {
-	    strcpy(answer, "BACULA WARNING - BNET_SUB_PROMPT signal received.");
-	    return STATE_WARNING;
-	 }
-	 else if (item->D_sock->msglen == BNET_HEARTBEAT) {
-	    bnet_sig(item->D_sock, BNET_HB_RESPONSE);
-	 }
-	 else {
-		sprintf(answer, "BACULA WARNING - Unexpected signal received : %s ", bnet_sig_to_ascii(item->D_sock));
-	 }
+                if (item->D_sock->msglen == BNET_EOD) {
+                strcpy(answer, "BACULA WARNING - << EOD >>");
+                return STATE_WARNING;
+         }
+         else if (item->D_sock->msglen == BNET_SUB_PROMPT) {
+            strcpy(answer, "BACULA WARNING - BNET_SUB_PROMPT signal received.");
+            return STATE_WARNING;
+         }
+         else if (item->D_sock->msglen == BNET_HEARTBEAT) {
+            item->D_sock->signal(BNET_HB_RESPONSE);
+         }
+         else {
+                sprintf(answer, "BACULA WARNING - Unexpected signal received : %s ", bnet_sig_to_ascii(item->D_sock));
+         }
       }
       else { /* BNET_HARDEOF || BNET_ERROR */
-		 strcpy(answer, "BACULA CRITICAL - ERROR: BNET_HARDEOF or BNET_ERROR");
-		 item->D_sock = NULL;
-		 return STATE_CRITICAL;
+                 strcpy(answer, "BACULA CRITICAL - ERROR: BNET_HARDEOF or BNET_ERROR");
+                 item->D_sock = NULL;
+                 return STATE_CRITICAL;
       }
 
-      if (is_bnet_stop(item->D_sock)) {
-		 item->D_sock = NULL;
-		 return STATE_WARNING;
+      if (item->D_sock->is_stop()) {
+                 item->D_sock = NULL;
+                 return STATE_WARNING;
       }
    }
 }
@@ -364,7 +365,6 @@ void writecmd(monitoritem* item, const char* command) {
    if (item->D_sock) {
       item->D_sock->msglen = strlen(command);
       pm_strcpy(&item->D_sock->msg, command);
-      bnet_send(item->D_sock);
+      item->D_sock->send();
    }
 }
-
diff --git a/bacula/examples/nagios/check_bacula/makeit b/bacula/examples/nagios/check_bacula/makeit
new file mode 100755
index 0000000..1cf3b1d
--- /dev/null
+++ b/bacula/examples/nagios/check_bacula/makeit
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+make LIBS="-lpthread -ldl -lssl -lcrypto -lz"
diff --git a/bacula/manpages/Makefile.in b/bacula/manpages/Makefile.in
index 4d2b152..929a97f 100644
--- a/bacula/manpages/Makefile.in
+++ b/bacula/manpages/Makefile.in
@@ -6,12 +6,10 @@
 
 MAN8 = bacula.8 bacula-dir.8 bacula-fd.8 bacula-sd.8 \
        bconsole.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 \
-       btraceback.8 dbcheck.8 bwild.8 bregex.8 
+       btraceback.8 dbcheck.8 bwild.8 bregex.8 bpluginfo.8
 
 MAN1 = bsmtp.1 bat.1
       
-# bacula-bgnome-console.1
-
 all:
 
 nothing:
diff --git a/bacula/manpages/bacula-bgnome-console.1 b/bacula/manpages/bacula-bgnome-console.1
deleted file mode 100644
index 876fab0..0000000
--- a/bacula/manpages/bacula-bgnome-console.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH BGNOME\-CONSOLE 1 "April 24, 2007" "Kern Sibbald" "Network backup, recovery and verification"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
- bgnome\-console \- Bacula's management Console, GUI version.
-.br
-.SH DESCRIPTION
-This manual page documents briefly the
-.B bgnome\-console
-command, the Gnome GUI version of the Bacula administration console.
-.sp 2
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invoke bold face and italics,
-.\" respectively.
-The Console allows the administrator or user to communicate with the
-Bacula Director. This is the Gnome version. It will also run under KDE.
-.PP
-This Gnome GUI interface is for the moment far from complete but is quite
-functional, having all the capabilities of the shell Console plus a number
-of GUI extensions that make interaction easier with point and click.
-.BR
-.SH SEE ALSO
-.BR bacula\-dir (8),
-.BR bls (1),
-.BR bextract (1).
-.br
-.SH AUTHOR
-This manual page was written by Jose Luis Tallon
-.nh
-<jltallon@adv\-solutions.net>.
diff --git a/bacula/manpages/bacula-bwxconsole.1 b/bacula/manpages/bacula-bwxconsole.1
deleted file mode 100644
index 1e56591..0000000
--- a/bacula/manpages/bacula-bwxconsole.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH BWX-CONSOLE 1 "24 April 2007" "Kern Sibbald" "Network backup, recovery and verification"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.SH NAME
- bwx-console \- Bacula's management Console
-.SH SYNOPSIS
-.B bwx-console
-.RI [options]
-.br
-.SH DESCRIPTION
-This manual page documents briefly the
-.B bwx-console
-command, the wxWidgets version of the Bacula administration console.
-.PP
-.SH OPTIONS
-bwx-console [\-s] [\-c config_file] [\-d debug_level] [-t]
-.TP
-.B \-c <config>
-Specify configuration file.
-.TP
-.B \-d <nn>
-Set debug level to \fInn\fP.
-.TP
-.B \-s
-No signals.
-.TP
-.B \-t
-Test config mode: read configuration and exit.
-.TP
-.B \-?
-Show version and usage of program.
-.SH SEE ALSO
-.BR bacula-dir (8),
-.BR bacula-bgnome-console (1)
-.BR bls (1),
-.BR bextract (1).
-.br
-.SH AUTHOR
-This manual page was written by Jose Luis Tallon
-.nh
-<jltallon@adv\-solutions.net>.
diff --git a/bacula/manpages/bacula-dir.8 b/bacula/manpages/bacula-dir.8
index c5cd965..e3664b6 100644
--- a/bacula/manpages/bacula-dir.8
+++ b/bacula/manpages/bacula-dir.8
@@ -37,6 +37,9 @@ Run in foreground (for debugging).
 .BI \-g\  group
 Set the group/gid to run as.
 .TP
+.BI \-m
+Print kaboom output (for debugging).
+.TP
 .BI \-r\  job
 Run <job>.
 .TP
diff --git a/bacula/manpages/bacula-fd.8 b/bacula/manpages/bacula-fd.8
index 9e9fca0..6a4d7fb 100644
--- a/bacula/manpages/bacula-fd.8
+++ b/bacula/manpages/bacula-fd.8
@@ -39,12 +39,12 @@ Run in foreground (for debugging).
 .BI \-g\  group
 Set the group/gid to run as.
 .TP
-.BI \-p
-Proceed inspite of I/O errors
-.TP
 .BI \-k
 Keep readall permission when dropping privileges.
 .TP
+.BI \-m
+Print kaboom output (for debugging).
+.TP
 .BI \-s
 No signals (for debugging).
 .TP
diff --git a/bacula/manpages/bacula-sd.8 b/bacula/manpages/bacula-sd.8
index 6dd36dc..aed27a3 100644
--- a/bacula/manpages/bacula-sd.8
+++ b/bacula/manpages/bacula-sd.8
@@ -40,6 +40,9 @@ Set the group/gid to run as.
 .BI \-p
 Proceed in spite of I/O errors
 .TP
+.BI \-m
+Print kaboom output (for debugging)
+.TP
 .BI \-s
 No signals (for debugging).
 .TP
diff --git a/bacula/manpages/bacula-tray-monitor.1 b/bacula/manpages/bacula-tray-monitor.1
index 811a4e4..39a2869 100644
--- a/bacula/manpages/bacula-tray-monitor.1
+++ b/bacula/manpages/bacula-tray-monitor.1
@@ -25,6 +25,9 @@ Specify configuration file.
 .B \-d <nn>
 Set debug level to \fInn\fP.
 .TP
+.B \-dt
+Print timestamp in debug output.
+.TP
 .B \-t
 Test config mode: read configuration and exit.
 .TP
@@ -32,7 +35,6 @@ Test config mode: read configuration and exit.
 Show version and usage of program.
 .SH SEE ALSO
 .BR bacula-dir (8),
-.BR bacula-wxconsole (1)
 .BR bls (1),
 .BR bextract (1).
 .br
diff --git a/bacula/manpages/bconsole.8 b/bacula/manpages/bconsole.8
index 13d892c..b536783 100644
--- a/bacula/manpages/bconsole.8
+++ b/bacula/manpages/bconsole.8
@@ -18,6 +18,12 @@ command.
 .PP
 .SH OPTIONS
 .TP
+.BI \-D\  dir
+Select a Director.
+.TP
+.BI \-l
+List defined Directors.
+.TP
 .BI \-c\  config
 Specify configuration file.
 .TP
@@ -33,6 +39,9 @@ No conio (for scripting).
 .B \-s
 No signals (for debugging).
 .TP
+.b \-u\  nn
+Set command execution timeout to \fInn\fP seconds.
+.TP
 .B \-t
 Test the configuration file and report errors.
 .TP
diff --git a/bacula/manpages/btape.8 b/bacula/manpages/btape.8
index e19a36f..2188ce2 100644
--- a/bacula/manpages/btape.8
+++ b/bacula/manpages/btape.8
@@ -38,9 +38,6 @@ Set debug level to \fInn\fP.
 .BI \-p
 Proceed inspite of I/O errors.
 .TP
-.B \-t
-Open the default tape device.
-.TP
 .B \-s
 No signals (for debugging).
 .TP
diff --git a/bacula/po/POTFILES.in b/bacula/po/POTFILES.in
index 13bccb8..c71ad84 100644
--- a/bacula/po/POTFILES.in
+++ b/bacula/po/POTFILES.in
@@ -162,7 +162,6 @@
 ./src/dird/ua_server.c
 ./src/dird/newvol.c
 ./src/dird/msgchan.c
-./src/dird/xua_output.c
 ./src/dird/getmsg.c
 ./src/dird/ua_input.c
 ./src/dird/dird_conf.c
@@ -342,39 +341,6 @@
 ./src/qt-console/clients/clients.h
 ./src/qt-console/joblist/joblist.h
 ./src/qt-console/joblog/joblog.h
-./src/qt-console/ui32/ui_mount.h
-./src/qt-console/ui32/ui_clientstat.h
-./src/qt-console/ui32/ui_clients.h
-./src/qt-console/ui32/ui_prune.h
-./src/qt-console/ui32/ui_textinput.h
-./src/qt-console/ui32/ui_joblog.h
-./src/qt-console/ui32/ui_fileset.h
-./src/qt-console/ui32/ui_relabel.h
-./src/qt-console/ui32/ui_storage.h
-./src/qt-console/ui32/ui_select.h
-./src/qt-console/ui32/ui_brestore.h
-./src/qt-console/ui32/ui_restore.h
-./src/qt-console/ui32/ui_prerestore.h
-./src/qt-console/ui32/ui_medialist.h
-./src/qt-console/ui32/ui_main.h
-./src/qt-console/ui32/ui_mediaedit.h
-./src/qt-console/ui32/ui_jobs.h
-./src/qt-console/ui32/ui_job.h
-./src/qt-console/ui32/ui_help.h
-./src/qt-console/ui32/ui_estimate.h
-./src/qt-console/ui32/ui_restoretree.h
-./src/qt-console/ui32/ui_mediainfo.h
-./src/qt-console/ui32/ui_run.h
-./src/qt-console/ui32/ui_storstat.h
-./src/qt-console/ui32/ui_mediaview.h
-./src/qt-console/ui32/ui_joblist.h
-./src/qt-console/ui32/ui_dirstat.h
-./src/qt-console/ui32/ui_runcmd.h
-./src/qt-console/ui32/ui_content.h
-./src/qt-console/ui32/ui_runrestore.h
-./src/qt-console/ui32/ui_label.h
-./src/qt-console/ui32/ui_console.h
-./src/qt-console/ui32/ui_prefs.h
 ./src/qt-console/medialist/medialist.h
 ./src/qt-console/medialist/mediaview.h
 ./src/qt-console/mediaedit/mediaedit.h
diff --git a/bacula/po/bacula.pot b/bacula/po/bacula.pot
index f4716b8..933c31d 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: 2014-03-23 22:51+0100\n"
+"POT-Creation-Date: 2014-03-30 20:55+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"
@@ -54,7 +54,7 @@ msgid ""
 "Please see "
 msgstr ""
 
-#: src/console/console_conf.c:128 src/qt-console/bat_conf.cpp:129
+#: src/console/console_conf.c:128 src/qt-console/bat_conf.cpp:130
 #, c-format
 msgid "No record for %d %s\n"
 msgstr ""
@@ -64,33 +64,33 @@ msgstr ""
 msgid "Console: name=%s rcfile=%s histfile=%s\n"
 msgstr ""
 
-#: src/console/console_conf.c:141 src/qt-console/bat_conf.cpp:138
+#: src/console/console_conf.c:141 src/qt-console/bat_conf.cpp:139
 #, c-format
 msgid "Director: name=%s address=%s DIRport=%d\n"
 msgstr ""
 
-#: src/console/console_conf.c:145 src/console/console_conf.c:221
-#: src/console/console_conf.c:266 src/console/console_conf.c:293
+#: src/console/console_conf.c:145 src/console/console_conf.c:224
+#: src/console/console_conf.c:269 src/console/console_conf.c:296
 #: src/stored/stored_conf.c:538 src/stored/stored_conf.c:628
 #: src/stored/stored_conf.c:663 src/filed/filed_conf.c:411
 #: src/filed/filed_conf.c:476 src/filed/filed_conf.c:506
-#: src/qt-console/bat_conf.cpp:149 src/qt-console/bat_conf.cpp:227
-#: src/qt-console/bat_conf.cpp:275 src/qt-console/bat_conf.cpp:305
+#: src/qt-console/bat_conf.cpp:150 src/qt-console/bat_conf.cpp:231
+#: src/qt-console/bat_conf.cpp:279 src/qt-console/bat_conf.cpp:309
 #, c-format
 msgid "Unknown resource type %d\n"
 msgstr ""
 
-#: src/console/console_conf.c:247 src/dird/dird_conf.c:1425
+#: src/console/console_conf.c:250 src/dird/dird_conf.c:1425
 #: src/dird/dird_conf.c:1440 src/filed/filed_conf.c:439
 #: src/qt-console/tray-monitor/tray_conf.cpp:276
-#: src/qt-console/bat_conf.cpp:253
+#: src/qt-console/bat_conf.cpp:257
 #, c-format
 msgid "%s item is required in %s resource, but not found.\n"
 msgstr ""
 
-#: src/console/console_conf.c:310 src/dird/dird_conf.c:1664
+#: src/console/console_conf.c:313 src/dird/dird_conf.c:1664
 #: src/filed/filed_conf.c:524 src/qt-console/tray-monitor/tray_conf.cpp:360
-#: src/qt-console/bat_conf.cpp:322
+#: src/qt-console/bat_conf.cpp:326
 #, c-format
 msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
 msgstr ""
@@ -194,38 +194,38 @@ msgstr ""
 msgid "You must enter a number between 1 and %d\n"
 msgstr ""
 
-#: src/console/console.c:1095 src/stored/stored.c:215 src/dird/dird.c:267
+#: src/console/console.c:1101 src/stored/stored.c:215 src/dird/dird.c:267
 #: src/filed/filed.c:204 src/qt-console/main.cpp:154
 msgid "Cryptography library initialization failed.\n"
 msgstr ""
 
-#: src/console/console.c:1099 src/stored/stored.c:219 src/dird/dird.c:271
+#: src/console/console.c:1105 src/stored/stored.c:219 src/dird/dird.c:271
 #: src/dird/dird.c:299 src/dird/dird.c:517 src/dird/dird.c:520
 #: src/filed/filed.c:209 src/qt-console/main.cpp:158
 #, c-format
 msgid "Please correct configuration file: %s\n"
 msgstr ""
 
-#: src/console/console.c:1129
+#: src/console/console.c:1136
 #, c-format
 msgid "Connecting to Director %s:%d\n"
 msgstr ""
 
-#: src/console/console.c:1146 src/qt-console/bcomm/dircomm.cpp:118
+#: src/console/console.c:1153 src/qt-console/bcomm/dircomm.cpp:150
 #, c-format
 msgid "Failed to initialize TLS context for Console \"%s\".\n"
 msgstr ""
 
-#: src/console/console.c:1166 src/qt-console/bcomm/dircomm.cpp:141
+#: src/console/console.c:1173 src/qt-console/bcomm/dircomm.cpp:173
 #, c-format
 msgid "Failed to initialize TLS context for Director \"%s\".\n"
 msgstr ""
 
-#: src/console/console.c:1198
+#: src/console/console.c:1205
 msgid "Enter a period to cancel a command.\n"
 msgstr ""
 
-#: src/console/console.c:1284 src/console/console.c:1314
+#: src/console/console.c:1291 src/console/console.c:1321
 #: src/stored/stored.c:342 src/dird/dird.c:607 src/dird/dird.c:813
 #: src/dird/dird.c:868 src/dird/dird.c:907 src/filed/filed.c:366
 #: src/filed/filed.c:566 src/qt-console/main.cpp:213
@@ -233,59 +233,59 @@ msgstr ""
 msgid "TLS required but not configured in Bacula.\n"
 msgstr ""
 
-#: src/console/console.c:1292 src/qt-console/main.cpp:221
+#: src/console/console.c:1299 src/qt-console/main.cpp:221
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Director \"%s\" in %s. At least one CA certificate store is required.\n"
 msgstr ""
 
-#: src/console/console.c:1301 src/qt-console/main.cpp:230
+#: src/console/console.c:1308 src/qt-console/main.cpp:230
 #, c-format
 msgid ""
 "No Director resource defined in %s\n"
 "Without that I don't how to speak to the Director :-(\n"
 msgstr ""
 
-#: src/console/console.c:1321 src/qt-console/main.cpp:251
+#: src/console/console.c:1328 src/qt-console/main.cpp:251
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Console \"%s\" in %s.\n"
 msgstr ""
 
-#: src/console/console.c:1347
+#: src/console/console.c:1354
 msgid "Too many arguments on input command.\n"
 msgstr ""
 
-#: src/console/console.c:1351
+#: src/console/console.c:1358
 msgid "First argument to input command must be a filename.\n"
 msgstr ""
 
-#: src/console/console.c:1357
+#: src/console/console.c:1364
 #, c-format
 msgid "Cannot open file %s for input. ERR=%s\n"
 msgstr ""
 
-#: src/console/console.c:1389
+#: src/console/console.c:1396
 msgid "Too many arguments on output/tee command.\n"
 msgstr ""
 
-#: src/console/console.c:1406
+#: src/console/console.c:1413
 #, c-format
 msgid "Cannot open file %s for output. ERR=%s\n"
 msgstr ""
 
-#: src/console/console.c:1425
+#: src/console/console.c:1432
 msgid "Too many arguments. Enclose command in double quotes.\n"
 msgstr ""
 
-#: src/console/console.c:1434
+#: src/console/console.c:1441
 #, c-format
 msgid "Cannot popen(\"%s\", \"r\"): ERR=%s\n"
 msgstr ""
 
-#: src/console/console.c:1446 src/stored/autochanger.c:665
+#: src/console/console.c:1453 src/stored/autochanger.c:665
 #, c-format
 msgid "Autochanger error: ERR=%s\n"
 msgstr ""
@@ -4129,7 +4129,7 @@ msgid "Bad storage command: %s"
 msgstr ""
 
 #: src/stored/dircmd.c:377 src/dird/msgchan.c:121 src/filed/job.c:1880
-#: src/qt-console/tray-monitor/tray-monitor.cpp:363
+#: src/qt-console/tray-monitor/tray-monitor.cpp:372
 msgid "Storage daemon"
 msgstr ""
 
@@ -5004,17 +5004,17 @@ msgstr ""
 msgid "Cannot free Volume \"%s\", because it is reserved by someone else.\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:512
+#: src/stored/vol_mgr.c:514
 #, c-format
 msgid "Volume %s is busy swapping from %s to %s\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:515
+#: src/stored/vol_mgr.c:517
 #, c-format
 msgid "Volume %s is busy swapping.\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:519
+#: src/stored/vol_mgr.c:521
 #, c-format
 msgid "%s device %s is busy.\n"
 msgstr ""
@@ -6600,30 +6600,30 @@ msgstr ""
 msgid "NULL jcr.\n"
 msgstr ""
 
-#: src/lib/jcr.c:496
+#: src/lib/jcr.c:495
 #, c-format
 msgid "JCR use_count=%d JobId=%d\n"
 msgstr ""
 
-#: src/lib/jcr.c:601
+#: src/lib/jcr.c:600
 #, c-format
 msgid "pthread_setspecific failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/jcr.c:1082
+#: src/lib/jcr.c:1081
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Storage "
 "daemon.\n"
 msgstr ""
 
-#: src/lib/jcr.c:1094
+#: src/lib/jcr.c:1093
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading File daemon.\n"
 msgstr ""
 
-#: src/lib/jcr.c:1106
+#: src/lib/jcr.c:1105
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Director.\n"
@@ -6652,98 +6652,98 @@ msgstr ""
 msgid "Close of NULL file\n"
 msgstr ""
 
-#: src/lib/lex.c:212
+#: src/lib/lex.c:215
 msgid ""
 "get_char: called after EOF. You may have a open double quote without the "
 "closing double quote.\n"
 msgstr ""
 
-#: src/lib/lex.c:254
+#: src/lib/lex.c:257
 #, c-format
 msgid "Config token too long, file: %s, line %d, begins at line %d\n"
 msgstr ""
 
-#: src/lib/lex.c:278
+#: src/lib/lex.c:281
 msgid "none"
 msgstr ""
 
-#: src/lib/lex.c:279
+#: src/lib/lex.c:282
 msgid "comment"
 msgstr ""
 
-#: src/lib/lex.c:280
+#: src/lib/lex.c:283
 msgid "number"
 msgstr ""
 
-#: src/lib/lex.c:281
+#: src/lib/lex.c:284
 msgid "ip_addr"
 msgstr ""
 
-#: src/lib/lex.c:282
+#: src/lib/lex.c:285
 msgid "identifier"
 msgstr ""
 
-#: src/lib/lex.c:283
+#: src/lib/lex.c:286
 msgid "string"
 msgstr ""
 
-#: src/lib/lex.c:284
+#: src/lib/lex.c:287
 msgid "quoted_string"
 msgstr ""
 
-#: src/lib/lex.c:285
+#: src/lib/lex.c:288
 msgid "include"
 msgstr ""
 
-#: src/lib/lex.c:286
+#: src/lib/lex.c:289
 msgid "include_quoted_string"
 msgstr ""
 
-#: src/lib/lex.c:287
+#: src/lib/lex.c:290
 msgid "UTF-8 Byte Order Mark"
 msgstr ""
 
-#: src/lib/lex.c:288
+#: src/lib/lex.c:291
 msgid "UTF-16le Byte Order Mark"
 msgstr ""
 
-#: src/lib/lex.c:326 src/lib/lex.c:332 src/lib/lex.c:343 src/lib/lex.c:349
+#: src/lib/lex.c:329 src/lib/lex.c:335 src/lib/lex.c:346 src/lib/lex.c:352
 #, c-format
 msgid "expected a positive integer number, got: %s"
 msgstr ""
 
-#: src/lib/lex.c:465
+#: src/lib/lex.c:468
 msgid ""
 "This config file appears to be in an unsupported Unicode format (UTF-16be). "
 "Please resave as UTF-8\n"
 msgstr ""
 
-#: src/lib/lex.c:611 src/lib/lex.c:639
+#: src/lib/lex.c:614 src/lib/lex.c:642
 #, c-format
 msgid "Cannot open included config file %s: %s\n"
 msgstr ""
 
-#: src/lib/lex.c:698 src/lib/lex.c:755
+#: src/lib/lex.c:701 src/lib/lex.c:758
 #, c-format
 msgid "expected an integer or a range, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:712 src/lib/lex.c:720 src/lib/lex.c:731 src/lib/lex.c:739
+#: src/lib/lex.c:715 src/lib/lex.c:723 src/lib/lex.c:734 src/lib/lex.c:742
 #, c-format
 msgid "expected an integer number, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:769
+#: src/lib/lex.c:772
 #, c-format
 msgid "expected a name, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:773
+#: src/lib/lex.c:776
 #, c-format
 msgid "name %s length %d too long, max is %d\n"
 msgstr ""
 
-#: src/lib/lex.c:781
+#: src/lib/lex.c:784
 #, c-format
 msgid "expected a string, got %s: %s"
 msgstr ""
@@ -8320,8 +8320,7 @@ msgstr ""
 msgid "Could not add job queue: ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:121 src/dird/ua_output.c:714 src/dird/xua_output.c:869
-#: src/tools/cats_test.c:363
+#: src/dird/job.c:121 src/dird/ua_output.c:714 src/tools/cats_test.c:363
 #, c-format
 msgid "Could not open database \"%s\".\n"
 msgstr ""
@@ -8611,16 +8610,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/ua_output.c:57 src/dird/ua_output.c:81 src/dird/xua_output.c:56
-#: src/dird/xua_output.c:80
+#: src/dird/ua_output.c:57 src/dird/ua_output.c:81
 msgid "ON or OFF keyword missing.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:101 src/dird/xua_output.c:100
+#: src/dird/ua_output.c:101
 msgid "Disabled Jobs:\n"
 msgstr ""
 
-#: src/dird/ua_output.c:107 src/dird/xua_output.c:106
+#: src/dird/ua_output.c:107
 msgid "No disabled Jobs.\n"
 msgstr ""
 
@@ -8628,94 +8626,93 @@ msgstr ""
 msgid "disabled"
 msgstr ""
 
-#: src/dird/ua_output.c:199 src/dird/xua_output.c:204
+#: src/dird/ua_output.c:199
 msgid "Keywords for the show command are:\n"
 msgstr ""
 
-#: src/dird/ua_output.c:205 src/dird/xua_output.c:211
+#: src/dird/ua_output.c:205
 #, c-format
 msgid "%s resource %s not found.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:208 src/dird/xua_output.c:215
+#: src/dird/ua_output.c:208
 #, c-format
 msgid "Resource %s not found\n"
 msgstr ""
 
-#: src/dird/ua_output.c:278 src/dird/xua_output.c:356
+#: src/dird/ua_output.c:278
 msgid "Hey! DB is NULL\n"
 msgstr ""
 
-#: src/dird/ua_output.c:435 src/dird/xua_output.c:590
+#: src/dird/ua_output.c:435
 #, c-format
 msgid "Jobid %d used %d Volume(s): %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:454 src/dird/xua_output.c:609
+#: src/dird/ua_output.c:454
 msgid "No Pool specified.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:465 src/dird/ua_select.c:531 src/dird/xua_output.c:620
-#: src/dird/ua_update.c:424
+#: src/dird/ua_output.c:465 src/dird/ua_select.c:531 src/dird/ua_update.c:424
 #, c-format
 msgid "Error obtaining pool ids. ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:475 src/dird/xua_output.c:630
+#: src/dird/ua_output.c:475
 #, c-format
 msgid "Pool: %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:491 src/dird/xua_output.c:646
+#: src/dird/ua_output.c:491
 msgid "Ignoring invalid value for days. Max is 50.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:513 src/dird/xua_output.c:668
+#: src/dird/ua_output.c:513
 #, c-format
 msgid "Unknown list keyword: %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:538 src/dird/xua_output.c:693
+#: src/dird/ua_output.c:538
 #, c-format
 msgid "%s is not a job name.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:552 src/dird/xua_output.c:707
+#: src/dird/ua_output.c:552
 #, c-format
 msgid "Could not find Pool for Job %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:565 src/dird/xua_output.c:720
+#: src/dird/ua_output.c:565
 #, c-format
 msgid "Could not find next Volume for Job %s (Pool=%s, Level=%s).\n"
 msgstr ""
 
-#: src/dird/ua_output.c:569 src/dird/xua_output.c:724
+#: src/dird/ua_output.c:569
 #, c-format
 msgid ""
 "The next Volume to be used by Job \"%s\" (Pool=%s, Level=%s) will be %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:582 src/dird/xua_output.c:737
+#: src/dird/ua_output.c:582
 #, c-format
 msgid "Could not find next Volume for Job %s.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:727 src/dird/xua_output.c:882
+#: src/dird/ua_output.c:727
 #, c-format
 msgid "Pool %s not in database. %s"
 msgstr ""
 
-#: src/dird/ua_output.c:735 src/dird/xua_output.c:890
+#: src/dird/ua_output.c:735
 #, c-format
 msgid "Pool %s created in database.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:788 src/dird/xua_output.c:943
+#: src/dird/ua_output.c:788
 msgid "You have no messages.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:868 src/dird/xua_output.c:1023
+#: src/dird/ua_output.c:868
 msgid "Message too long to display.\n"
 msgstr ""
 
@@ -12707,19 +12704,6 @@ msgstr ""
 msgid "Director's connection to SD for this Job was lost.\n"
 msgstr ""
 
-#: src/dird/xua_output.c:518
-msgid "Invalid jobid argument\n"
-msgstr ""
-
-#: src/dird/xua_output.c:542
-#, c-format
-msgid "Unknown ObjectType %s\n"
-msgstr ""
-
-#: src/dird/xua_output.c:552
-msgid "list pluginrestoreconf requires jobid argument\n"
-msgstr ""
-
 #: src/dird/getmsg.c:160
 #, c-format
 msgid "bget_dirmsg: unknown bnet signal %d\n"
@@ -16668,7 +16652,7 @@ msgstr ""
 msgid "DROP-Stmt went wrong\n"
 msgstr ""
 
-#: examples/nagios/check_bacula/check_bacula.c:59
+#: examples/nagios/check_bacula/check_bacula.c:57
 #, c-format
 msgid ""
 "Copyright (C) 2005 Christian Masopust\n"
@@ -16686,58 +16670,58 @@ msgstr ""
 msgid "Failed ASSERT: %s\n"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:79
+#: src/qt-console/bcomm/dircomm.cpp:85
 #, c-format
 msgid "Already connected\"%s\".\n"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:90
+#: src/qt-console/bcomm/dircomm.cpp:96
 #: src/qt-console/tray-monitor/tray-monitor.cpp:347
 #, c-format
 msgid "Connecting to Director %s:%d"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:92
+#: src/qt-console/bcomm/dircomm.cpp:98
 #, c-format
 msgid ""
 "Connecting to Director %s:%d\n"
 "\n"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:163
-#: src/qt-console/tray-monitor/tray-monitor.cpp:349
+#: src/qt-console/bcomm/dircomm.cpp:195
+#: src/qt-console/tray-monitor/tray-monitor.cpp:352
 msgid "Director daemon"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:201
+#: src/qt-console/bcomm/dircomm.cpp:233
 msgid "Initializing ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:217 src/qt-console/console/console.cpp:130
+#: src/qt-console/bcomm/dircomm.cpp:249 src/qt-console/console/console.cpp:130
 msgid "Connected"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:341
+#: src/qt-console/bcomm/dircomm.cpp:373
 msgid "Command completed ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:348 src/qt-console/console/console.cpp:367
+#: src/qt-console/bcomm/dircomm.cpp:380 src/qt-console/console/console.cpp:367
 msgid "Processing command ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:355
+#: src/qt-console/bcomm/dircomm.cpp:387
 msgid "At main prompt waiting for input ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:362 src/qt-console/bcomm/dircomm.cpp:375
+#: src/qt-console/bcomm/dircomm.cpp:394 src/qt-console/bcomm/dircomm.cpp:407
 msgid "At prompt waiting for input ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:383
+#: src/qt-console/bcomm/dircomm.cpp:415
 msgid "Command failed."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:455
+#: src/qt-console/bcomm/dircomm.cpp:487
 msgid "Director disconnected."
 msgstr ""
 
@@ -16762,7 +16746,7 @@ msgid "Storage: name=%s address=%s SDport=%d\n"
 msgstr ""
 
 #: src/qt-console/tray-monitor/tray_conf.cpp:183
-#: src/qt-console/bat_conf.cpp:145
+#: src/qt-console/bat_conf.cpp:146
 #, c-format
 msgid "ConsoleFont: name=%s font face=%s\n"
 msgstr ""
@@ -16810,52 +16794,52 @@ msgstr ""
 msgid "Error, currentitem is not a Client or a Storage..\n"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:354
+#: src/qt-console/tray-monitor/tray-monitor.cpp:357
 #, c-format
 msgid "Connecting to Client %s:%d"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:356
+#: src/qt-console/tray-monitor/tray-monitor.cpp:362
 msgid "File daemon"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:361
+#: src/qt-console/tray-monitor/tray-monitor.cpp:367
 #, c-format
 msgid "Connecting to Storage %s:%d"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:367
-#: src/qt-console/tray-monitor/tray-monitor.cpp:397
+#: src/qt-console/tray-monitor/tray-monitor.cpp:376
+#: src/qt-console/tray-monitor/tray-monitor.cpp:406
 #, c-format
 msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:372
+#: src/qt-console/tray-monitor/tray-monitor.cpp:381
 msgid "Cannot connect to daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:381
+#: src/qt-console/tray-monitor/tray-monitor.cpp:390
 #, c-format
 msgid "Authentication error : %s"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:388
+#: src/qt-console/tray-monitor/tray-monitor.cpp:397
 msgid "Opened connection with Director daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:391
+#: src/qt-console/tray-monitor/tray-monitor.cpp:400
 msgid "Opened connection with File daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:394
+#: src/qt-console/tray-monitor/tray-monitor.cpp:403
 msgid "Opened connection with Storage daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:445
+#: src/qt-console/tray-monitor/tray-monitor.cpp:454
 msgid "Error : BNET_HARDEOF or BNET_ERROR"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:454
+#: src/qt-console/tray-monitor/tray-monitor.cpp:463
 msgid "Error : Connection closed."
 msgstr ""
 
@@ -16903,7 +16887,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/qt-console/bat_conf.cpp:142
+#: src/qt-console/bat_conf.cpp:143
 #, c-format
 msgid "Console: name=%s\n"
 msgstr ""
diff --git a/bacula/po/de.po b/bacula/po/de.po
index c569806..cf06654 100644
--- a/bacula/po/de.po
+++ b/bacula/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2014-03-23 22:51+0100\n"
+"POT-Creation-Date: 2014-03-30 20:55+0200\n"
 "PO-Revision-Date: 2005-04-15 14:11+01200\n"
 "Last-Translator: Kern Sibbald <kern@sibbald.com>\n"
 "Language-Team: German bacula-devel\n"
@@ -63,7 +63,7 @@ msgstr ""
 "F�r Hilfe bitte unter http://www.bacula.org/rel-manual/faq."
 "html#AuthorizationErrors nachsehen.\n"
 
-#: src/console/console_conf.c:128 src/qt-console/bat_conf.cpp:129
+#: src/console/console_conf.c:128 src/qt-console/bat_conf.cpp:130
 #, c-format
 msgid "No record for %d %s\n"
 msgstr ""
@@ -73,33 +73,33 @@ msgstr ""
 msgid "Console: name=%s rcfile=%s histfile=%s\n"
 msgstr ""
 
-#: src/console/console_conf.c:141 src/qt-console/bat_conf.cpp:138
+#: src/console/console_conf.c:141 src/qt-console/bat_conf.cpp:139
 #, c-format
 msgid "Director: name=%s address=%s DIRport=%d\n"
 msgstr ""
 
-#: src/console/console_conf.c:145 src/console/console_conf.c:221
-#: src/console/console_conf.c:266 src/console/console_conf.c:293
+#: src/console/console_conf.c:145 src/console/console_conf.c:224
+#: src/console/console_conf.c:269 src/console/console_conf.c:296
 #: src/stored/stored_conf.c:538 src/stored/stored_conf.c:628
 #: src/stored/stored_conf.c:663 src/filed/filed_conf.c:411
 #: src/filed/filed_conf.c:476 src/filed/filed_conf.c:506
-#: src/qt-console/bat_conf.cpp:149 src/qt-console/bat_conf.cpp:227
-#: src/qt-console/bat_conf.cpp:275 src/qt-console/bat_conf.cpp:305
+#: src/qt-console/bat_conf.cpp:150 src/qt-console/bat_conf.cpp:231
+#: src/qt-console/bat_conf.cpp:279 src/qt-console/bat_conf.cpp:309
 #, c-format
 msgid "Unknown resource type %d\n"
 msgstr ""
 
-#: src/console/console_conf.c:247 src/dird/dird_conf.c:1425
+#: src/console/console_conf.c:250 src/dird/dird_conf.c:1425
 #: src/dird/dird_conf.c:1440 src/filed/filed_conf.c:439
 #: src/qt-console/tray-monitor/tray_conf.cpp:276
-#: src/qt-console/bat_conf.cpp:253
+#: src/qt-console/bat_conf.cpp:257
 #, c-format
 msgid "%s item is required in %s resource, but not found.\n"
 msgstr "%s item wird in %s resource ben�tigt, wurde aber nicht gefunden.\n"
 
-#: src/console/console_conf.c:310 src/dird/dird_conf.c:1664
+#: src/console/console_conf.c:313 src/dird/dird_conf.c:1664
 #: src/filed/filed_conf.c:524 src/qt-console/tray-monitor/tray_conf.cpp:360
-#: src/qt-console/bat_conf.cpp:322
+#: src/qt-console/bat_conf.cpp:326
 #, c-format
 msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
 msgstr ""
@@ -205,38 +205,38 @@ msgstr ""
 msgid "You must enter a number between 1 and %d\n"
 msgstr ""
 
-#: src/console/console.c:1095 src/stored/stored.c:215 src/dird/dird.c:267
+#: src/console/console.c:1101 src/stored/stored.c:215 src/dird/dird.c:267
 #: src/filed/filed.c:204 src/qt-console/main.cpp:154
 msgid "Cryptography library initialization failed.\n"
 msgstr "Initialisierung der Verschl�sselungsbibliothek fehlgeschlagen.\n"
 
-#: src/console/console.c:1099 src/stored/stored.c:219 src/dird/dird.c:271
+#: src/console/console.c:1105 src/stored/stored.c:219 src/dird/dird.c:271
 #: src/dird/dird.c:299 src/dird/dird.c:517 src/dird/dird.c:520
 #: src/filed/filed.c:209 src/qt-console/main.cpp:158
 #, c-format
 msgid "Please correct configuration file: %s\n"
 msgstr "Bitte die Konfigurationsdatei korrigieren: %s\n"
 
-#: src/console/console.c:1129
+#: src/console/console.c:1136
 #, c-format
 msgid "Connecting to Director %s:%d\n"
 msgstr ""
 
-#: src/console/console.c:1146 src/qt-console/bcomm/dircomm.cpp:118
+#: src/console/console.c:1153 src/qt-console/bcomm/dircomm.cpp:150
 #, c-format
 msgid "Failed to initialize TLS context for Console \"%s\".\n"
 msgstr ""
 
-#: src/console/console.c:1166 src/qt-console/bcomm/dircomm.cpp:141
+#: src/console/console.c:1173 src/qt-console/bcomm/dircomm.cpp:173
 #, c-format
 msgid "Failed to initialize TLS context for Director \"%s\".\n"
 msgstr ""
 
-#: src/console/console.c:1198
+#: src/console/console.c:1205
 msgid "Enter a period to cancel a command.\n"
 msgstr ""
 
-#: src/console/console.c:1284 src/console/console.c:1314
+#: src/console/console.c:1291 src/console/console.c:1321
 #: src/stored/stored.c:342 src/dird/dird.c:607 src/dird/dird.c:813
 #: src/dird/dird.c:868 src/dird/dird.c:907 src/filed/filed.c:366
 #: src/filed/filed.c:566 src/qt-console/main.cpp:213
@@ -244,59 +244,59 @@ msgstr ""
 msgid "TLS required but not configured in Bacula.\n"
 msgstr "TLS ben�tigt aber nicht konfiguriert in Bacula.\n"
 
-#: src/console/console.c:1292 src/qt-console/main.cpp:221
+#: src/console/console.c:1299 src/qt-console/main.cpp:221
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Director \"%s\" in %s. At least one CA certificate store is required.\n"
 msgstr ""
 
-#: src/console/console.c:1301 src/qt-console/main.cpp:230
+#: src/console/console.c:1308 src/qt-console/main.cpp:230
 #, c-format
 msgid ""
 "No Director resource defined in %s\n"
 "Without that I don't how to speak to the Director :-(\n"
 msgstr ""
 
-#: src/console/console.c:1321 src/qt-console/main.cpp:251
+#: src/console/console.c:1328 src/qt-console/main.cpp:251
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Console \"%s\" in %s.\n"
 msgstr ""
 
-#: src/console/console.c:1347
+#: src/console/console.c:1354
 msgid "Too many arguments on input command.\n"
 msgstr ""
 
-#: src/console/console.c:1351
+#: src/console/console.c:1358
 msgid "First argument to input command must be a filename.\n"
 msgstr ""
 
-#: src/console/console.c:1357
+#: src/console/console.c:1364
 #, c-format
 msgid "Cannot open file %s for input. ERR=%s\n"
 msgstr ""
 
-#: src/console/console.c:1389
+#: src/console/console.c:1396
 msgid "Too many arguments on output/tee command.\n"
 msgstr ""
 
-#: src/console/console.c:1406
+#: src/console/console.c:1413
 #, c-format
 msgid "Cannot open file %s for output. ERR=%s\n"
 msgstr ""
 
-#: src/console/console.c:1425
+#: src/console/console.c:1432
 msgid "Too many arguments. Enclose command in double quotes.\n"
 msgstr ""
 
-#: src/console/console.c:1434
+#: src/console/console.c:1441
 #, fuzzy, c-format
 msgid "Cannot popen(\"%s\", \"r\"): ERR=%s\n"
 msgstr "Kann Ausdruck\"%s\"nicht aufl�sen: ERR=%s\n"
 
-#: src/console/console.c:1446 src/stored/autochanger.c:665
+#: src/console/console.c:1453 src/stored/autochanger.c:665
 #, c-format
 msgid "Autochanger error: ERR=%s\n"
 msgstr ""
@@ -4231,7 +4231,7 @@ msgid "Bad storage command: %s"
 msgstr ""
 
 #: src/stored/dircmd.c:377 src/dird/msgchan.c:121 src/filed/job.c:1880
-#: src/qt-console/tray-monitor/tray-monitor.cpp:363
+#: src/qt-console/tray-monitor/tray-monitor.cpp:372
 msgid "Storage daemon"
 msgstr "Storage daemon"
 
@@ -5123,17 +5123,17 @@ msgstr "Konnte FileSet \"%s\" Eintrag nicht erzeugen. ERR=%s\n"
 msgid "Cannot free Volume \"%s\", because it is reserved by someone else.\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:512
+#: src/stored/vol_mgr.c:514
 #, c-format
 msgid "Volume %s is busy swapping from %s to %s\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:515
+#: src/stored/vol_mgr.c:517
 #, fuzzy, c-format
 msgid "Volume %s is busy swapping.\n"
 msgstr "unbekannt"
 
-#: src/stored/vol_mgr.c:519
+#: src/stored/vol_mgr.c:521
 #, fuzzy, c-format
 msgid "%s device %s is busy.\n"
 msgstr "unbekannt"
@@ -6741,30 +6741,30 @@ msgstr "Konnte job queue nicht initialiseren: ERR=%s\n"
 msgid "NULL jcr.\n"
 msgstr ""
 
-#: src/lib/jcr.c:496
+#: src/lib/jcr.c:495
 #, c-format
 msgid "JCR use_count=%d JobId=%d\n"
 msgstr ""
 
-#: src/lib/jcr.c:601
+#: src/lib/jcr.c:600
 #, fuzzy, c-format
 msgid "pthread_setspecific failed: ERR=%s\n"
 msgstr "Media id select fehlgeschlagen: ERR=%s\n"
 
-#: src/lib/jcr.c:1082
+#: src/lib/jcr.c:1081
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Storage "
 "daemon.\n"
 msgstr ""
 
-#: src/lib/jcr.c:1094
+#: src/lib/jcr.c:1093
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading File daemon.\n"
 msgstr ""
 
-#: src/lib/jcr.c:1106
+#: src/lib/jcr.c:1105
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Director.\n"
@@ -6793,98 +6793,98 @@ msgstr ""
 msgid "Close of NULL file\n"
 msgstr ""
 
-#: src/lib/lex.c:212
+#: src/lib/lex.c:215
 msgid ""
 "get_char: called after EOF. You may have a open double quote without the "
 "closing double quote.\n"
 msgstr ""
 
-#: src/lib/lex.c:254
+#: src/lib/lex.c:257
 #, c-format
 msgid "Config token too long, file: %s, line %d, begins at line %d\n"
 msgstr ""
 
-#: src/lib/lex.c:278
+#: src/lib/lex.c:281
 msgid "none"
 msgstr ""
 
-#: src/lib/lex.c:279
+#: src/lib/lex.c:282
 msgid "comment"
 msgstr ""
 
-#: src/lib/lex.c:280
+#: src/lib/lex.c:283
 msgid "number"
 msgstr ""
 
-#: src/lib/lex.c:281
+#: src/lib/lex.c:284
 msgid "ip_addr"
 msgstr ""
 
-#: src/lib/lex.c:282
+#: src/lib/lex.c:285
 msgid "identifier"
 msgstr ""
 
-#: src/lib/lex.c:283
+#: src/lib/lex.c:286
 msgid "string"
 msgstr ""
 
-#: src/lib/lex.c:284
+#: src/lib/lex.c:287
 msgid "quoted_string"
 msgstr ""
 
-#: src/lib/lex.c:285
+#: src/lib/lex.c:288
 msgid "include"
 msgstr ""
 
-#: src/lib/lex.c:286
+#: src/lib/lex.c:289
 msgid "include_quoted_string"
 msgstr ""
 
-#: src/lib/lex.c:287
+#: src/lib/lex.c:290
 msgid "UTF-8 Byte Order Mark"
 msgstr ""
 
-#: src/lib/lex.c:288
+#: src/lib/lex.c:291
 msgid "UTF-16le Byte Order Mark"
 msgstr ""
 
-#: src/lib/lex.c:326 src/lib/lex.c:332 src/lib/lex.c:343 src/lib/lex.c:349
+#: src/lib/lex.c:329 src/lib/lex.c:335 src/lib/lex.c:346 src/lib/lex.c:352
 #, c-format
 msgid "expected a positive integer number, got: %s"
 msgstr ""
 
-#: src/lib/lex.c:465
+#: src/lib/lex.c:468
 msgid ""
 "This config file appears to be in an unsupported Unicode format (UTF-16be). "
 "Please resave as UTF-8\n"
 msgstr ""
 
-#: src/lib/lex.c:611 src/lib/lex.c:639
+#: src/lib/lex.c:614 src/lib/lex.c:642
 #, c-format
 msgid "Cannot open included config file %s: %s\n"
 msgstr ""
 
-#: src/lib/lex.c:698 src/lib/lex.c:755
+#: src/lib/lex.c:701 src/lib/lex.c:758
 #, c-format
 msgid "expected an integer or a range, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:712 src/lib/lex.c:720 src/lib/lex.c:731 src/lib/lex.c:739
+#: src/lib/lex.c:715 src/lib/lex.c:723 src/lib/lex.c:734 src/lib/lex.c:742
 #, c-format
 msgid "expected an integer number, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:769
+#: src/lib/lex.c:772
 #, c-format
 msgid "expected a name, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:773
+#: src/lib/lex.c:776
 #, c-format
 msgid "name %s length %d too long, max is %d\n"
 msgstr ""
 
-#: src/lib/lex.c:781
+#: src/lib/lex.c:784
 #, c-format
 msgid "expected a string, got %s: %s"
 msgstr ""
@@ -8477,8 +8477,7 @@ msgstr "Konnte job queue nicht initialiseren: ERR=%s\n"
 msgid "Could not add job queue: ERR=%s\n"
 msgstr "Konnte job queue nicht hinzuf�gen: ERR=%s\n"
 
-#: src/dird/job.c:121 src/dird/ua_output.c:714 src/dird/xua_output.c:869
-#: src/tools/cats_test.c:363
+#: src/dird/job.c:121 src/dird/ua_output.c:714 src/tools/cats_test.c:363
 #, c-format
 msgid "Could not open database \"%s\".\n"
 msgstr "Konnte Datenbank \"%s\" nicht �ffen.\n"
@@ -8810,17 +8809,16 @@ msgstr ""
 "  Beendigungsstatus:      %s\n"
 "\n"
 
-#: src/dird/ua_output.c:57 src/dird/ua_output.c:81 src/dird/xua_output.c:56
-#: src/dird/xua_output.c:80
+#: src/dird/ua_output.c:57 src/dird/ua_output.c:81
 msgid "ON or OFF keyword missing.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:101 src/dird/xua_output.c:100
+#: src/dird/ua_output.c:101
 #, fuzzy
 msgid "Disabled Jobs:\n"
 msgstr "ist nicht aktiviert"
 
-#: src/dird/ua_output.c:107 src/dird/xua_output.c:106
+#: src/dird/ua_output.c:107
 msgid "No disabled Jobs.\n"
 msgstr ""
 
@@ -8829,94 +8827,93 @@ msgstr ""
 msgid "disabled"
 msgstr "ist nicht aktiviert"
 
-#: src/dird/ua_output.c:199 src/dird/xua_output.c:204
+#: src/dird/ua_output.c:199
 msgid "Keywords for the show command are:\n"
 msgstr ""
 
-#: src/dird/ua_output.c:205 src/dird/xua_output.c:211
+#: src/dird/ua_output.c:205
 #, c-format
 msgid "%s resource %s not found.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:208 src/dird/xua_output.c:215
+#: src/dird/ua_output.c:208
 #, c-format
 msgid "Resource %s not found\n"
 msgstr ""
 
-#: src/dird/ua_output.c:278 src/dird/xua_output.c:356
+#: src/dird/ua_output.c:278
 msgid "Hey! DB is NULL\n"
 msgstr ""
 
-#: src/dird/ua_output.c:435 src/dird/xua_output.c:590
+#: src/dird/ua_output.c:435
 #, c-format
 msgid "Jobid %d used %d Volume(s): %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:454 src/dird/xua_output.c:609
+#: src/dird/ua_output.c:454
 msgid "No Pool specified.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:465 src/dird/ua_select.c:531 src/dird/xua_output.c:620
-#: src/dird/ua_update.c:424
+#: src/dird/ua_output.c:465 src/dird/ua_select.c:531 src/dird/ua_update.c:424
 #, c-format
 msgid "Error obtaining pool ids. ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:475 src/dird/xua_output.c:630
+#: src/dird/ua_output.c:475
 #, c-format
 msgid "Pool: %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:491 src/dird/xua_output.c:646
+#: src/dird/ua_output.c:491
 msgid "Ignoring invalid value for days. Max is 50.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:513 src/dird/xua_output.c:668
+#: src/dird/ua_output.c:513
 #, c-format
 msgid "Unknown list keyword: %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:538 src/dird/xua_output.c:693
+#: src/dird/ua_output.c:538
 #, c-format
 msgid "%s is not a job name.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:552 src/dird/xua_output.c:707
+#: src/dird/ua_output.c:552
 #, fuzzy, c-format
 msgid "Could not find Pool for Job %s\n"
 msgstr "Konnte Datenbank \"%s\" nicht �ffen.\n"
 
-#: src/dird/ua_output.c:565 src/dird/xua_output.c:720
+#: src/dird/ua_output.c:565
 #, c-format
 msgid "Could not find next Volume for Job %s (Pool=%s, Level=%s).\n"
 msgstr ""
 
-#: src/dird/ua_output.c:569 src/dird/xua_output.c:724
+#: src/dird/ua_output.c:569
 #, c-format
 msgid ""
 "The next Volume to be used by Job \"%s\" (Pool=%s, Level=%s) will be %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:582 src/dird/xua_output.c:737
+#: src/dird/ua_output.c:582
 #, c-format
 msgid "Could not find next Volume for Job %s.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:727 src/dird/xua_output.c:882
+#: src/dird/ua_output.c:727
 #, c-format
 msgid "Pool %s not in database. %s"
 msgstr "Pool %s nicht in der Datenbank. %s"
 
-#: src/dird/ua_output.c:735 src/dird/xua_output.c:890
+#: src/dird/ua_output.c:735
 #, c-format
 msgid "Pool %s created in database.\n"
 msgstr "Pool %s in der Datenbank angelegt.\n"
 
-#: src/dird/ua_output.c:788 src/dird/xua_output.c:943
+#: src/dird/ua_output.c:788
 msgid "You have no messages.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:868 src/dird/xua_output.c:1023
+#: src/dird/ua_output.c:868
 msgid "Message too long to display.\n"
 msgstr ""
 
@@ -13112,20 +13109,6 @@ msgstr "Kann \"message thread\" nicht erzeugen: %s\n"
 msgid "Director's connection to SD for this Job was lost.\n"
 msgstr ""
 
-#: src/dird/xua_output.c:518
-#, fuzzy
-msgid "Invalid jobid argument\n"
-msgstr "Ung�ltige JobId gefunden.\n"
-
-#: src/dird/xua_output.c:542
-#, fuzzy, c-format
-msgid "Unknown ObjectType %s\n"
-msgstr "Unbekannter \"Migration Selection Type\".\n"
-
-#: src/dird/xua_output.c:552
-msgid "list pluginrestoreconf requires jobid argument\n"
-msgstr ""
-
 #: src/dird/getmsg.c:160
 #, c-format
 msgid "bget_dirmsg: unknown bnet signal %d\n"
@@ -17159,7 +17142,7 @@ msgstr ""
 msgid "DROP-Stmt went wrong\n"
 msgstr ""
 
-#: examples/nagios/check_bacula/check_bacula.c:59
+#: examples/nagios/check_bacula/check_bacula.c:57
 #, c-format
 msgid ""
 "Copyright (C) 2005 Christian Masopust\n"
@@ -17177,58 +17160,58 @@ msgstr ""
 msgid "Failed ASSERT: %s\n"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:79
+#: src/qt-console/bcomm/dircomm.cpp:85
 #, c-format
 msgid "Already connected\"%s\".\n"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:90
+#: src/qt-console/bcomm/dircomm.cpp:96
 #: src/qt-console/tray-monitor/tray-monitor.cpp:347
 #, c-format
 msgid "Connecting to Director %s:%d"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:92
+#: src/qt-console/bcomm/dircomm.cpp:98
 #, c-format
 msgid ""
 "Connecting to Director %s:%d\n"
 "\n"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:163
-#: src/qt-console/tray-monitor/tray-monitor.cpp:349
+#: src/qt-console/bcomm/dircomm.cpp:195
+#: src/qt-console/tray-monitor/tray-monitor.cpp:352
 msgid "Director daemon"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:201
+#: src/qt-console/bcomm/dircomm.cpp:233
 msgid "Initializing ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:217 src/qt-console/console/console.cpp:130
+#: src/qt-console/bcomm/dircomm.cpp:249 src/qt-console/console/console.cpp:130
 msgid "Connected"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:341
+#: src/qt-console/bcomm/dircomm.cpp:373
 msgid "Command completed ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:348 src/qt-console/console/console.cpp:367
+#: src/qt-console/bcomm/dircomm.cpp:380 src/qt-console/console/console.cpp:367
 msgid "Processing command ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:355
+#: src/qt-console/bcomm/dircomm.cpp:387
 msgid "At main prompt waiting for input ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:362 src/qt-console/bcomm/dircomm.cpp:375
+#: src/qt-console/bcomm/dircomm.cpp:394 src/qt-console/bcomm/dircomm.cpp:407
 msgid "At prompt waiting for input ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:383
+#: src/qt-console/bcomm/dircomm.cpp:415
 msgid "Command failed."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:455
+#: src/qt-console/bcomm/dircomm.cpp:487
 msgid "Director disconnected."
 msgstr ""
 
@@ -17253,7 +17236,7 @@ msgid "Storage: name=%s address=%s SDport=%d\n"
 msgstr ""
 
 #: src/qt-console/tray-monitor/tray_conf.cpp:183
-#: src/qt-console/bat_conf.cpp:145
+#: src/qt-console/bat_conf.cpp:146
 #, c-format
 msgid "ConsoleFont: name=%s font face=%s\n"
 msgstr ""
@@ -17318,52 +17301,52 @@ msgstr ""
 msgid "Error, currentitem is not a Client or a Storage..\n"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:354
+#: src/qt-console/tray-monitor/tray-monitor.cpp:357
 #, c-format
 msgid "Connecting to Client %s:%d"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:356
+#: src/qt-console/tray-monitor/tray-monitor.cpp:362
 msgid "File daemon"
 msgstr "File daemon"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:361
+#: src/qt-console/tray-monitor/tray-monitor.cpp:367
 #, c-format
 msgid "Connecting to Storage %s:%d"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:367
-#: src/qt-console/tray-monitor/tray-monitor.cpp:397
+#: src/qt-console/tray-monitor/tray-monitor.cpp:376
+#: src/qt-console/tray-monitor/tray-monitor.cpp:406
 #, c-format
 msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:372
+#: src/qt-console/tray-monitor/tray-monitor.cpp:381
 msgid "Cannot connect to daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:381
+#: src/qt-console/tray-monitor/tray-monitor.cpp:390
 #, c-format
 msgid "Authentication error : %s"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:388
+#: src/qt-console/tray-monitor/tray-monitor.cpp:397
 msgid "Opened connection with Director daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:391
+#: src/qt-console/tray-monitor/tray-monitor.cpp:400
 msgid "Opened connection with File daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:394
+#: src/qt-console/tray-monitor/tray-monitor.cpp:403
 msgid "Opened connection with Storage daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:445
+#: src/qt-console/tray-monitor/tray-monitor.cpp:454
 msgid "Error : BNET_HARDEOF or BNET_ERROR"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:454
+#: src/qt-console/tray-monitor/tray-monitor.cpp:463
 msgid "Error : Connection closed."
 msgstr ""
 
@@ -17428,12 +17411,20 @@ msgstr ""
 "       -?          diese Meldung ausgeben.\n"
 "\n"
 
-#: src/qt-console/bat_conf.cpp:142
+#: src/qt-console/bat_conf.cpp:143
 #, c-format
 msgid "Console: name=%s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Invalid jobid argument\n"
+#~ msgstr "Ung�ltige JobId gefunden.\n"
+
+#, fuzzy
+#~ msgid "Unknown ObjectType %s\n"
+#~ msgstr "Unbekannter \"Migration Selection Type\".\n"
+
+#, fuzzy
 #~ msgid "Cannot open current directory: ERR=%s\n"
 #~ msgstr "Kann inkludierte Datei nicht �ffnen: %s. ERR=%s\n"
 
@@ -17556,10 +17547,6 @@ msgstr ""
 #~ msgstr "Pool Ressource \"%s\" nicht gefunden.\n"
 
 #, fuzzy
-#~ msgid "# Bacula bwx-console Configuration File\n"
-#~ msgstr "Bitte die Konfigurationsdatei korrigieren: %s\n"
-
-#, fuzzy
 #~ msgid "Close without saving"
 #~ msgstr "%s OK -- mit Warnungen"
 
@@ -17737,10 +17724,6 @@ msgstr ""
 #~ msgstr "unbekannt"
 
 #, fuzzy
-#~ msgid "Bacula bwx-console"
-#~ msgstr "Bitte die Konfigurationsdatei korrigieren: %s\n"
-
-#, fuzzy
 #~ msgid "Change of configuration file"
 #~ msgstr "Bitte die Konfigurationsdatei korrigieren: %s\n"
 
@@ -17849,36 +17832,6 @@ msgstr ""
 #~ msgid "No Catalog resource defined for client %s\n"
 #~ msgstr "Keine Messages resource definiert in %s\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Version: %s (%s) %s %s %s\n"
-#~ "\n"
-#~ "Usage: bgnome-console [-s] [-c config_file] [-d debug_level] "
-#~ "[config_file]\n"
-#~ "       -c <file>   set configuration file to file\n"
-#~ "       -dnn        set debug level to nn\n"
-#~ "       -s          no signals\n"
-#~ "       -t          test - read configuration and exit\n"
-#~ "       -?          print this message.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Version: %s (%s)\n"
-#~ "\n"
-#~ "Usage: dird [-f -s] [-c config_file] [-d debug_level] [config_file]\n"
-#~ "       -c <file>   setze Konfigurationsdatei auf Datei\n"
-#~ "       -dnn        setze debug level auf nn\n"
-#~ "       -f          starte im Vordergrund (f�r debugging Zwecke)\n"
-#~ "       -g          groupid\n"
-#~ "       -r <job>    starte <job> jetzt\n"
-#~ "       -s          no signals\n"
-#~ "       -t          test - Konfiguration Lesen und beenden\n"
-#~ "       -u          userid\n"
-#~ "       -v          ausf�hrliche Benutzer Meldungen\n"
-#~ "       -?          diese Meldung ausgeben.\n"
-#~ "\n"
-
 #~ msgid "pthread_mutex_lock: ERR=%s\n"
 #~ msgstr "pthread_mutex_lock: ERR=%s\n"
 
diff --git a/bacula/po/es.po b/bacula/po/es.po
index 275c62e..b9eb106 100644
--- a/bacula/po/es.po
+++ b/bacula/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Bacula 3.0.2\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2014-03-23 22:51+0100\n"
+"POT-Creation-Date: 2014-03-30 20:55+0200\n"
 "PO-Revision-Date: 2009-12-01 16:04-0300\n"
 "Last-Translator: Victor Hugo dos Santos <listas.vhs@gmail.com>\n"
 "Language-Team: Bacula Spanish Team <bacula-users-es@lists.sourceforge.net>\n"
@@ -66,7 +66,7 @@ msgstr ""
 "Por favor, consulte http://www.bacula.org/en/rel-manual/"
 "Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 para ayuda.\n"
 
-#: src/console/console_conf.c:128 src/qt-console/bat_conf.cpp:129
+#: src/console/console_conf.c:128 src/qt-console/bat_conf.cpp:130
 #, c-format
 msgid "No record for %d %s\n"
 msgstr "Ningún registro para %d %s\n"
@@ -76,33 +76,33 @@ msgstr "Ningún registro para %d %s\n"
 msgid "Console: name=%s rcfile=%s histfile=%s\n"
 msgstr "Console: nombre=%s rcfile=%s histfile=%s\n"
 
-#: src/console/console_conf.c:141 src/qt-console/bat_conf.cpp:138
+#: src/console/console_conf.c:141 src/qt-console/bat_conf.cpp:139
 #, c-format
 msgid "Director: name=%s address=%s DIRport=%d\n"
 msgstr "Director: nombre=%s dirección=%s DIRport=%d\n"
 
-#: src/console/console_conf.c:145 src/console/console_conf.c:221
-#: src/console/console_conf.c:266 src/console/console_conf.c:293
+#: src/console/console_conf.c:145 src/console/console_conf.c:224
+#: src/console/console_conf.c:269 src/console/console_conf.c:296
 #: src/stored/stored_conf.c:538 src/stored/stored_conf.c:628
 #: src/stored/stored_conf.c:663 src/filed/filed_conf.c:411
 #: src/filed/filed_conf.c:476 src/filed/filed_conf.c:506
-#: src/qt-console/bat_conf.cpp:149 src/qt-console/bat_conf.cpp:227
-#: src/qt-console/bat_conf.cpp:275 src/qt-console/bat_conf.cpp:305
+#: src/qt-console/bat_conf.cpp:150 src/qt-console/bat_conf.cpp:231
+#: src/qt-console/bat_conf.cpp:279 src/qt-console/bat_conf.cpp:309
 #, c-format
 msgid "Unknown resource type %d\n"
 msgstr "Tipo de recurso desconocido %d\n"
 
-#: src/console/console_conf.c:247 src/dird/dird_conf.c:1425
+#: src/console/console_conf.c:250 src/dird/dird_conf.c:1425
 #: src/dird/dird_conf.c:1440 src/filed/filed_conf.c:439
 #: src/qt-console/tray-monitor/tray_conf.cpp:276
-#: src/qt-console/bat_conf.cpp:253
+#: src/qt-console/bat_conf.cpp:257
 #, c-format
 msgid "%s item is required in %s resource, but not found.\n"
 msgstr "Ítem %s es necesario en recurso %s, pero no se encuentra.\n"
 
-#: src/console/console_conf.c:310 src/dird/dird_conf.c:1664
+#: src/console/console_conf.c:313 src/dird/dird_conf.c:1664
 #: src/filed/filed_conf.c:524 src/qt-console/tray-monitor/tray_conf.cpp:360
-#: src/qt-console/bat_conf.cpp:322
+#: src/qt-console/bat_conf.cpp:326
 #, c-format
 msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
 msgstr ""
@@ -209,38 +209,38 @@ msgstr "%s no es un número. Debe introducir un número entre 1 y %d\n"
 msgid "You must enter a number between 1 and %d\n"
 msgstr "Debe de introducir un numero entre 1 y %d\n"
 
-#: src/console/console.c:1095 src/stored/stored.c:215 src/dird/dird.c:267
+#: src/console/console.c:1101 src/stored/stored.c:215 src/dird/dird.c:267
 #: src/filed/filed.c:204 src/qt-console/main.cpp:154
 msgid "Cryptography library initialization failed.\n"
 msgstr "Inicialización de la librería de criptografía ha fallado.\n"
 
-#: src/console/console.c:1099 src/stored/stored.c:219 src/dird/dird.c:271
+#: src/console/console.c:1105 src/stored/stored.c:219 src/dird/dird.c:271
 #: src/dird/dird.c:299 src/dird/dird.c:517 src/dird/dird.c:520
 #: src/filed/filed.c:209 src/qt-console/main.cpp:158
 #, c-format
 msgid "Please correct configuration file: %s\n"
 msgstr "Por favor, corrija el archivo de configuración: %s\n"
 
-#: src/console/console.c:1129
+#: src/console/console.c:1136
 #, c-format
 msgid "Connecting to Director %s:%d\n"
 msgstr "Conectando al Director %s:%d\n"
 
-#: src/console/console.c:1146 src/qt-console/bcomm/dircomm.cpp:118
+#: src/console/console.c:1153 src/qt-console/bcomm/dircomm.cpp:150
 #, c-format
 msgid "Failed to initialize TLS context for Console \"%s\".\n"
 msgstr "Fallo al inicializar el contexto TLS para la consola \"%s\".\n"
 
-#: src/console/console.c:1166 src/qt-console/bcomm/dircomm.cpp:141
+#: src/console/console.c:1173 src/qt-console/bcomm/dircomm.cpp:173
 #, c-format
 msgid "Failed to initialize TLS context for Director \"%s\".\n"
 msgstr "Fallo al inicializar el contexto TLS para el Director \"%s\".\n"
 
-#: src/console/console.c:1198
+#: src/console/console.c:1205
 msgid "Enter a period to cancel a command.\n"
 msgstr "Introduzca un período para cancelar un comando.\n"
 
-#: src/console/console.c:1284 src/console/console.c:1314
+#: src/console/console.c:1291 src/console/console.c:1321
 #: src/stored/stored.c:342 src/dird/dird.c:607 src/dird/dird.c:813
 #: src/dird/dird.c:868 src/dird/dird.c:907 src/filed/filed.c:366
 #: src/filed/filed.c:566 src/qt-console/main.cpp:213
@@ -248,7 +248,7 @@ msgstr "Introduzca un período para cancelar un comando.\n"
 msgid "TLS required but not configured in Bacula.\n"
 msgstr "Se requiere TLS pero no está configurado en Bacula.\n"
 
-#: src/console/console.c:1292 src/qt-console/main.cpp:221
+#: src/console/console.c:1299 src/qt-console/main.cpp:221
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -258,7 +258,7 @@ msgstr ""
 "definidos para Director \"%s\" en %s. Por lo menos un almacén de "
 "Certificados CA es necesario.\n"
 
-#: src/console/console.c:1301 src/qt-console/main.cpp:230
+#: src/console/console.c:1308 src/qt-console/main.cpp:230
 #, c-format
 msgid ""
 "No Director resource defined in %s\n"
@@ -267,7 +267,7 @@ msgstr ""
 "Recurso Director no definido en %s\n"
 "Sin eso no sé cómo hablar con el Director :-(\n"
 
-#: src/console/console.c:1321 src/qt-console/main.cpp:251
+#: src/console/console.c:1328 src/qt-console/main.cpp:251
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -276,39 +276,39 @@ msgstr ""
 "Ni \"Certificado TLS CA\" o \"Directorio de Certificado TLS CA\" están "
 "definidos para Console \"%s\" en %s.\n"
 
-#: src/console/console.c:1347
+#: src/console/console.c:1354
 msgid "Too many arguments on input command.\n"
 msgstr "Demasiados argumentos en comando de entrada.\n"
 
-#: src/console/console.c:1351
+#: src/console/console.c:1358
 msgid "First argument to input command must be a filename.\n"
 msgstr ""
 "Primer argumento para comandos de entrada debe ser un nombre de archivo.\n"
 
-#: src/console/console.c:1357
+#: src/console/console.c:1364
 #, c-format
 msgid "Cannot open file %s for input. ERR=%s\n"
 msgstr "No se puede abrir el archivo %s para entrada. ERR=%s\n"
 
-#: src/console/console.c:1389
+#: src/console/console.c:1396
 msgid "Too many arguments on output/tee command.\n"
 msgstr "Demasiados argumentos en la salida del comando output/tee.\n"
 
-#: src/console/console.c:1406
+#: src/console/console.c:1413
 #, c-format
 msgid "Cannot open file %s for output. ERR=%s\n"
 msgstr "No se puede abrir el archivo %s para salida. ERR=%s\n"
 
-#: src/console/console.c:1425
+#: src/console/console.c:1432
 msgid "Too many arguments. Enclose command in double quotes.\n"
 msgstr "Demasiados argumentos. Incluya comando entre comillas dobles.\n"
 
-#: src/console/console.c:1434
+#: src/console/console.c:1441
 #, c-format
 msgid "Cannot popen(\"%s\", \"r\"): ERR=%s\n"
 msgstr "No puede popen(\"%s\", \"r\"): ERR=%s\n"
 
-#: src/console/console.c:1446 src/stored/autochanger.c:665
+#: src/console/console.c:1453 src/stored/autochanger.c:665
 #, c-format
 msgid "Autochanger error: ERR=%s\n"
 msgstr "Auto-cambiador error: ERR=%s\n"
@@ -4691,7 +4691,7 @@ msgid "Bad storage command: %s"
 msgstr "Malo comando storage: %s"
 
 #: src/stored/dircmd.c:377 src/dird/msgchan.c:121 src/filed/job.c:1880
-#: src/qt-console/tray-monitor/tray-monitor.cpp:363
+#: src/qt-console/tray-monitor/tray-monitor.cpp:372
 msgid "Storage daemon"
 msgstr "Demonio Storage"
 
@@ -5629,17 +5629,17 @@ msgstr "No es posible reservar volumen %s en %s\n"
 msgid "Cannot free Volume \"%s\", because it is reserved by someone else.\n"
 msgstr "No se puede podar Volumen \"%s\", porque el esta archivo.\n"
 
-#: src/stored/vol_mgr.c:512
+#: src/stored/vol_mgr.c:514
 #, c-format
 msgid "Volume %s is busy swapping from %s to %s\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:515
+#: src/stored/vol_mgr.c:517
 #, fuzzy, c-format
 msgid "Volume %s is busy swapping.\n"
 msgstr "3936 Dispositivo %s está ocupado leyendo.\n"
 
-#: src/stored/vol_mgr.c:519
+#: src/stored/vol_mgr.c:521
 #, fuzzy, c-format
 msgid "%s device %s is busy.\n"
 msgstr "3936 Dispositivo %s está ocupado leyendo.\n"
@@ -7307,17 +7307,17 @@ msgstr "No se pudo iniciar msg_queue mutex. ERR=%s\n"
 msgid "NULL jcr.\n"
 msgstr "NULL jcr.\n"
 
-#: src/lib/jcr.c:496
+#: src/lib/jcr.c:495
 #, c-format
 msgid "JCR use_count=%d JobId=%d\n"
 msgstr "JCR use_count=%d JobId=%d\n"
 
-#: src/lib/jcr.c:601
+#: src/lib/jcr.c:600
 #, c-format
 msgid "pthread_setspecific failed: ERR=%s\n"
 msgstr "fallo pthread_setspecific: ERR=%s\n"
 
-#: src/lib/jcr.c:1082
+#: src/lib/jcr.c:1081
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Storage "
@@ -7326,7 +7326,7 @@ msgstr ""
 "Watchdog envío kill después de %d segundos para hilo estancado leyendo "
 "demonio Storage.\n"
 
-#: src/lib/jcr.c:1094
+#: src/lib/jcr.c:1093
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading File daemon.\n"
@@ -7334,7 +7334,7 @@ msgstr ""
 "Watchdog envío kill después de %d segundos para hilo estancado leyendo "
 "demonio File.\n"
 
-#: src/lib/jcr.c:1106
+#: src/lib/jcr.c:1105
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Director.\n"
@@ -7369,7 +7369,7 @@ msgstr "Error de configuración: %s\n"
 msgid "Close of NULL file\n"
 msgstr "Cierre de archivo NULL\n"
 
-#: src/lib/lex.c:212
+#: src/lib/lex.c:215
 msgid ""
 "get_char: called after EOF. You may have a open double quote without the "
 "closing double quote.\n"
@@ -7377,63 +7377,63 @@ msgstr ""
 "get_char: llamado después de EOF. Usted puede tener una comilla doble "
 "abierta sin el cierre de comillas dobles.\n"
 
-#: src/lib/lex.c:254
+#: src/lib/lex.c:257
 #, c-format
 msgid "Config token too long, file: %s, line %d, begins at line %d\n"
 msgstr ""
 "Configuración de señal demasiado largo, archivo: %s, línea %d, se inicia en "
 "la línea %d\n"
 
-#: src/lib/lex.c:278
+#: src/lib/lex.c:281
 msgid "none"
 msgstr "ninguno"
 
-#: src/lib/lex.c:279
+#: src/lib/lex.c:282
 msgid "comment"
 msgstr "comentario"
 
-#: src/lib/lex.c:280
+#: src/lib/lex.c:283
 msgid "number"
 msgstr "numero"
 
-#: src/lib/lex.c:281
+#: src/lib/lex.c:284
 msgid "ip_addr"
 msgstr "ip_addr"
 
-#: src/lib/lex.c:282
+#: src/lib/lex.c:285
 msgid "identifier"
 msgstr "identificar"
 
-#: src/lib/lex.c:283
+#: src/lib/lex.c:286
 msgid "string"
 msgstr "cadena"
 
-#: src/lib/lex.c:284
+#: src/lib/lex.c:287
 msgid "quoted_string"
 msgstr "quoted_string"
 
-#: src/lib/lex.c:285
+#: src/lib/lex.c:288
 msgid "include"
 msgstr "incluir"
 
-#: src/lib/lex.c:286
+#: src/lib/lex.c:289
 msgid "include_quoted_string"
 msgstr "include_quoted_string"
 
-#: src/lib/lex.c:287
+#: src/lib/lex.c:290
 msgid "UTF-8 Byte Order Mark"
 msgstr "Marca de Orden de UTF-8 Byte"
 
-#: src/lib/lex.c:288
+#: src/lib/lex.c:291
 msgid "UTF-16le Byte Order Mark"
 msgstr "Marca de Orden de UTF-16le Byte"
 
-#: src/lib/lex.c:326 src/lib/lex.c:332 src/lib/lex.c:343 src/lib/lex.c:349
+#: src/lib/lex.c:329 src/lib/lex.c:335 src/lib/lex.c:346 src/lib/lex.c:352
 #, c-format
 msgid "expected a positive integer number, got: %s"
 msgstr "esperaba un numero entero positivo, obtuvo: %s"
 
-#: src/lib/lex.c:465
+#: src/lib/lex.c:468
 msgid ""
 "This config file appears to be in an unsupported Unicode format (UTF-16be). "
 "Please resave as UTF-8\n"
@@ -7441,32 +7441,32 @@ msgstr ""
 "Este archivo de configuración parece estar en un formato no compatible con "
 "Unicode (UTF-16be). Por favor, vuelva a guardar como UTF-8\n"
 
-#: src/lib/lex.c:611 src/lib/lex.c:639
+#: src/lib/lex.c:614 src/lib/lex.c:642
 #, c-format
 msgid "Cannot open included config file %s: %s\n"
 msgstr "No se puede abrir el archivo de configuración incluido %s: %s\n"
 
-#: src/lib/lex.c:698 src/lib/lex.c:755
+#: src/lib/lex.c:701 src/lib/lex.c:758
 #, c-format
 msgid "expected an integer or a range, got %s: %s"
 msgstr "esperaba un numero entero o un rango, obtuvo %s: %s"
 
-#: src/lib/lex.c:712 src/lib/lex.c:720 src/lib/lex.c:731 src/lib/lex.c:739
+#: src/lib/lex.c:715 src/lib/lex.c:723 src/lib/lex.c:734 src/lib/lex.c:742
 #, c-format
 msgid "expected an integer number, got %s: %s"
 msgstr "esperaba un numero entero, obtuvo %s: %s"
 
-#: src/lib/lex.c:769
+#: src/lib/lex.c:772
 #, c-format
 msgid "expected a name, got %s: %s"
 msgstr "esperaba un nombre, obtuvo %s: %s"
 
-#: src/lib/lex.c:773
+#: src/lib/lex.c:776
 #, c-format
 msgid "name %s length %d too long, max is %d\n"
 msgstr "nombre %s longitud %d demasiado largo, el máximo es %d\n"
 
-#: src/lib/lex.c:781
+#: src/lib/lex.c:784
 #, c-format
 msgid "expected a string, got %s: %s"
 msgstr "esperaba una cadena, obtuvo %s: %s"
@@ -9103,8 +9103,7 @@ msgstr "No se pudo iniciar la cola de trabajos: ERR=%s\n"
 msgid "Could not add job queue: ERR=%s\n"
 msgstr "No se ha podido añadir la cola de trabajo: ERR=%s\n"
 
-#: src/dird/job.c:121 src/dird/ua_output.c:714 src/dird/xua_output.c:869
-#: src/tools/cats_test.c:363
+#: src/dird/job.c:121 src/dird/ua_output.c:714 src/tools/cats_test.c:363
 #, c-format
 msgid "Could not open database \"%s\".\n"
 msgstr "No se puede abrir la base de datos \"%s\".\n"
@@ -9434,16 +9433,15 @@ msgstr ""
 " Terminación: %s\n"
 "\n"
 
-#: src/dird/ua_output.c:57 src/dird/ua_output.c:81 src/dird/xua_output.c:56
-#: src/dird/xua_output.c:80
+#: src/dird/ua_output.c:57 src/dird/ua_output.c:81
 msgid "ON or OFF keyword missing.\n"
 msgstr "Faltan palabra clave ON u OFF.\n"
 
-#: src/dird/ua_output.c:101 src/dird/xua_output.c:100
+#: src/dird/ua_output.c:101
 msgid "Disabled Jobs:\n"
 msgstr "Jobs Deshabilitados:\n"
 
-#: src/dird/ua_output.c:107 src/dird/xua_output.c:106
+#: src/dird/ua_output.c:107
 msgid "No disabled Jobs.\n"
 msgstr "Ningún Jobs Deshabilitado.\n"
 
@@ -9451,70 +9449,69 @@ msgstr "Ningún Jobs Deshabilitado.\n"
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: src/dird/ua_output.c:199 src/dird/xua_output.c:204
+#: src/dird/ua_output.c:199
 msgid "Keywords for the show command are:\n"
 msgstr "Palabras clave para el comando show son:\n"
 
-#: src/dird/ua_output.c:205 src/dird/xua_output.c:211
+#: src/dird/ua_output.c:205
 #, c-format
 msgid "%s resource %s not found.\n"
 msgstr "%s recurso %s no encontrado.\n"
 
-#: src/dird/ua_output.c:208 src/dird/xua_output.c:215
+#: src/dird/ua_output.c:208
 #, c-format
 msgid "Resource %s not found\n"
 msgstr "Recursos %s no encontrado\n"
 
-#: src/dird/ua_output.c:278 src/dird/xua_output.c:356
+#: src/dird/ua_output.c:278
 msgid "Hey! DB is NULL\n"
 msgstr "Hey! BD esta VACÍA\n"
 
-#: src/dird/ua_output.c:435 src/dird/xua_output.c:590
+#: src/dird/ua_output.c:435
 #, c-format
 msgid "Jobid %d used %d Volume(s): %s\n"
 msgstr "Jobid %d usado %d Volumen(s): %s\n"
 
-#: src/dird/ua_output.c:454 src/dird/xua_output.c:609
+#: src/dird/ua_output.c:454
 msgid "No Pool specified.\n"
 msgstr "Ningún Pool especificado.\n"
 
-#: src/dird/ua_output.c:465 src/dird/ua_select.c:531 src/dird/xua_output.c:620
-#: src/dird/ua_update.c:424
+#: src/dird/ua_output.c:465 src/dird/ua_select.c:531 src/dird/ua_update.c:424
 #, c-format
 msgid "Error obtaining pool ids. ERR=%s\n"
 msgstr "Error al obteniendo pool ids. ERR=%s\n"
 
-#: src/dird/ua_output.c:475 src/dird/xua_output.c:630
+#: src/dird/ua_output.c:475
 #, c-format
 msgid "Pool: %s\n"
 msgstr "Pool: %s\n"
 
-#: src/dird/ua_output.c:491 src/dird/xua_output.c:646
+#: src/dird/ua_output.c:491
 msgid "Ignoring invalid value for days. Max is 50.\n"
 msgstr "Ignorando valor invalido para días. Máximo es 50.\n"
 
-#: src/dird/ua_output.c:513 src/dird/xua_output.c:668
+#: src/dird/ua_output.c:513
 #, c-format
 msgid "Unknown list keyword: %s\n"
 msgstr "Lista de palabras clave desconocida: %s\n"
 
-#: src/dird/ua_output.c:538 src/dird/xua_output.c:693
+#: src/dird/ua_output.c:538
 #, c-format
 msgid "%s is not a job name.\n"
 msgstr "%s no es un nombre de Job.\n"
 
-#: src/dird/ua_output.c:552 src/dird/xua_output.c:707
+#: src/dird/ua_output.c:552
 #, c-format
 msgid "Could not find Pool for Job %s\n"
 msgstr "No se pudo encontrar Pool para Job %s\n"
 
-#: src/dird/ua_output.c:565 src/dird/xua_output.c:720
+#: src/dird/ua_output.c:565
 #, c-format
 msgid "Could not find next Volume for Job %s (Pool=%s, Level=%s).\n"
 msgstr ""
 "No se pudo encontrar el siguiente Volumen para Job %s (Pool=%s, Nivel=%s).\n"
 
-#: src/dird/ua_output.c:569 src/dird/xua_output.c:724
+#: src/dird/ua_output.c:569
 #, c-format
 msgid ""
 "The next Volume to be used by Job \"%s\" (Pool=%s, Level=%s) will be %s\n"
@@ -9522,26 +9519,26 @@ msgstr ""
 "El próximo Volumen que se utilizará por Job \"%s\" (Pool=%s, Nivel=%s) será "
 "%s\n"
 
-#: src/dird/ua_output.c:582 src/dird/xua_output.c:737
+#: src/dird/ua_output.c:582
 #, c-format
 msgid "Could not find next Volume for Job %s.\n"
 msgstr "No se pudo encontrar el siguiente Volumen para Job %s.\n"
 
-#: src/dird/ua_output.c:727 src/dird/xua_output.c:882
+#: src/dird/ua_output.c:727
 #, c-format
 msgid "Pool %s not in database. %s"
 msgstr "Pool %s no creado en la base de datos. %s"
 
-#: src/dird/ua_output.c:735 src/dird/xua_output.c:890
+#: src/dird/ua_output.c:735
 #, c-format
 msgid "Pool %s created in database.\n"
 msgstr "Pool %s creado en la base de datos.\n"
 
-#: src/dird/ua_output.c:788 src/dird/xua_output.c:943
+#: src/dird/ua_output.c:788
 msgid "You have no messages.\n"
 msgstr "Usted no tiene mensajes.\n"
 
-#: src/dird/ua_output.c:868 src/dird/xua_output.c:1023
+#: src/dird/ua_output.c:868
 msgid "Message too long to display.\n"
 msgstr "Mensaje demasiado largo para mostrar.\n"
 
@@ -13966,20 +13963,6 @@ msgstr "No se puede crear hilo de mensaje: %s\n"
 msgid "Director's connection to SD for this Job was lost.\n"
 msgstr ""
 
-#: src/dird/xua_output.c:518
-#, fuzzy
-msgid "Invalid jobid argument\n"
-msgstr "argumento invalido"
-
-#: src/dird/xua_output.c:542
-#, fuzzy, c-format
-msgid "Unknown ObjectType %s\n"
-msgstr "Tipo de base de datos desconocido: %s\n"
-
-#: src/dird/xua_output.c:552
-msgid "list pluginrestoreconf requires jobid argument\n"
-msgstr ""
-
 #: src/dird/getmsg.c:160
 #, c-format
 msgid "bget_dirmsg: unknown bnet signal %d\n"
@@ -18289,7 +18272,7 @@ msgstr ""
 msgid "DROP-Stmt went wrong\n"
 msgstr ""
 
-#: examples/nagios/check_bacula/check_bacula.c:59
+#: examples/nagios/check_bacula/check_bacula.c:57
 #, c-format
 msgid ""
 "Copyright (C) 2005 Christian Masopust\n"
@@ -18307,18 +18290,18 @@ msgstr "===================================================================\n"
 msgid "Failed ASSERT: %s\n"
 msgstr "Fallo ASSERT: %s\n"
 
-#: src/qt-console/bcomm/dircomm.cpp:79
+#: src/qt-console/bcomm/dircomm.cpp:85
 #, c-format
 msgid "Already connected\"%s\".\n"
 msgstr "Ya conectado\"%s\".\n"
 
-#: src/qt-console/bcomm/dircomm.cpp:90
+#: src/qt-console/bcomm/dircomm.cpp:96
 #: src/qt-console/tray-monitor/tray-monitor.cpp:347
 #, c-format
 msgid "Connecting to Director %s:%d"
 msgstr "Conectando con Director %s:%d"
 
-#: src/qt-console/bcomm/dircomm.cpp:92
+#: src/qt-console/bcomm/dircomm.cpp:98
 #, c-format
 msgid ""
 "Connecting to Director %s:%d\n"
@@ -18327,40 +18310,40 @@ msgstr ""
 "Conectando con Director %s:%d\n"
 "\n"
 
-#: src/qt-console/bcomm/dircomm.cpp:163
-#: src/qt-console/tray-monitor/tray-monitor.cpp:349
+#: src/qt-console/bcomm/dircomm.cpp:195
+#: src/qt-console/tray-monitor/tray-monitor.cpp:352
 msgid "Director daemon"
 msgstr "Servicio Director"
 
-#: src/qt-console/bcomm/dircomm.cpp:201
+#: src/qt-console/bcomm/dircomm.cpp:233
 msgid "Initializing ..."
 msgstr "Inicializando ..."
 
-#: src/qt-console/bcomm/dircomm.cpp:217 src/qt-console/console/console.cpp:130
+#: src/qt-console/bcomm/dircomm.cpp:249 src/qt-console/console/console.cpp:130
 msgid "Connected"
 msgstr "Conectado"
 
-#: src/qt-console/bcomm/dircomm.cpp:341
+#: src/qt-console/bcomm/dircomm.cpp:373
 msgid "Command completed ..."
 msgstr "Comando completado ..."
 
-#: src/qt-console/bcomm/dircomm.cpp:348 src/qt-console/console/console.cpp:367
+#: src/qt-console/bcomm/dircomm.cpp:380 src/qt-console/console/console.cpp:367
 msgid "Processing command ..."
 msgstr "Procesando comando ..."
 
-#: src/qt-console/bcomm/dircomm.cpp:355
+#: src/qt-console/bcomm/dircomm.cpp:387
 msgid "At main prompt waiting for input ..."
 msgstr "En prompt principal esperando por una entrada..."
 
-#: src/qt-console/bcomm/dircomm.cpp:362 src/qt-console/bcomm/dircomm.cpp:375
+#: src/qt-console/bcomm/dircomm.cpp:394 src/qt-console/bcomm/dircomm.cpp:407
 msgid "At prompt waiting for input ..."
 msgstr "En prompt esperando por una entrada..."
 
-#: src/qt-console/bcomm/dircomm.cpp:383
+#: src/qt-console/bcomm/dircomm.cpp:415
 msgid "Command failed."
 msgstr "Comando fallido."
 
-#: src/qt-console/bcomm/dircomm.cpp:455
+#: src/qt-console/bcomm/dircomm.cpp:487
 msgid "Director disconnected."
 msgstr "Director desconectado."
 
@@ -18385,7 +18368,7 @@ msgid "Storage: name=%s address=%s SDport=%d\n"
 msgstr "Storage: nombre=%s dirección=%s SDport=%d\n"
 
 #: src/qt-console/tray-monitor/tray_conf.cpp:183
-#: src/qt-console/bat_conf.cpp:145
+#: src/qt-console/bat_conf.cpp:146
 #, c-format
 msgid "ConsoleFont: name=%s font face=%s\n"
 msgstr "ConsoleFont: nombre=%s font face=%s\n"
@@ -18452,52 +18435,52 @@ msgstr ""
 msgid "Error, currentitem is not a Client or a Storage..\n"
 msgstr "Error, CurrentItem no es un Cliente o un Storage ...\n"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:354
+#: src/qt-console/tray-monitor/tray-monitor.cpp:357
 #, c-format
 msgid "Connecting to Client %s:%d"
 msgstr "Conectando con Cliente %s:%d"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:356
+#: src/qt-console/tray-monitor/tray-monitor.cpp:362
 msgid "File daemon"
 msgstr "demonio File"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:361
+#: src/qt-console/tray-monitor/tray-monitor.cpp:367
 #, c-format
 msgid "Connecting to Storage %s:%d"
 msgstr "Conectando con Storage %s:%d"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:367
-#: src/qt-console/tray-monitor/tray-monitor.cpp:397
+#: src/qt-console/tray-monitor/tray-monitor.cpp:376
+#: src/qt-console/tray-monitor/tray-monitor.cpp:406
 #, c-format
 msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
 msgstr "Error, currentitem no es un cliente, un Storage o un Director..\n"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:372
+#: src/qt-console/tray-monitor/tray-monitor.cpp:381
 msgid "Cannot connect to daemon."
 msgstr "No se puede conectar al demonio"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:381
+#: src/qt-console/tray-monitor/tray-monitor.cpp:390
 #, c-format
 msgid "Authentication error : %s"
 msgstr "Error de autenticación : %s"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:388
+#: src/qt-console/tray-monitor/tray-monitor.cpp:397
 msgid "Opened connection with Director daemon."
 msgstr "Conexión abierta con demonio Director."
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:391
+#: src/qt-console/tray-monitor/tray-monitor.cpp:400
 msgid "Opened connection with File daemon."
 msgstr "Conexión abierta con demonio File."
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:394
+#: src/qt-console/tray-monitor/tray-monitor.cpp:403
 msgid "Opened connection with Storage daemon."
 msgstr "Conexión abierta con demonio Storage."
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:445
+#: src/qt-console/tray-monitor/tray-monitor.cpp:454
 msgid "Error : BNET_HARDEOF or BNET_ERROR"
 msgstr "Error: BNET_HARDEOF o BNET_ERROR"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:454
+#: src/qt-console/tray-monitor/tray-monitor.cpp:463
 msgid "Error : Connection closed."
 msgstr "Error : Conexión cerrada."
 
@@ -18563,11 +18546,19 @@ msgstr ""
 " -? imprimir este mensaje.\n"
 "\n"
 
-#: src/qt-console/bat_conf.cpp:142
+#: src/qt-console/bat_conf.cpp:143
 #, c-format
 msgid "Console: name=%s\n"
 msgstr "Console: nombre=%s\n"
 
+#, fuzzy
+#~ msgid "Invalid jobid argument\n"
+#~ msgstr "argumento invalido"
+
+#, fuzzy
+#~ msgid "Unknown ObjectType %s\n"
+#~ msgstr "Tipo de base de datos desconocido: %s\n"
+
 #~ msgid "No FreeSpace command defined.\n"
 #~ msgstr "Comando FreeSpace no definido.\n"
 
@@ -19239,9 +19230,6 @@ msgstr "Console: nombre=%s\n"
 #~ msgid "Config file editor"
 #~ msgstr "Editor de archivos de configuración"
 
-#~ msgid "# Bacula bwx-console Configuration File\n"
-#~ msgstr "# Bacula bwx-console Archivo de Configuración\n"
-
 #~ msgid "Save and close"
 #~ msgstr "Guardar y cerrar"
 
@@ -19363,9 +19351,6 @@ msgstr "Console: nombre=%s\n"
 #~ msgid "Unexpected question has been received.\n"
 #~ msgstr "Pregunta inesperada ha sido recibida.\n"
 
-#~ msgid "bwx-console: unexpected restore question."
-#~ msgstr "bwx-console: inesperada consulta de restauración."
-
 #~ msgid " files selected to be restored."
 #~ msgstr "archivos seleccionados para ser restaurado."
 
@@ -19404,19 +19389,6 @@ msgstr "Console: nombre=%s\n"
 #~ msgid "Failed to retrieve jobid.\n"
 #~ msgstr "No se ha podido recuperar jobId.\n"
 
-#~ msgid ""
-#~ "Restore is scheduled to run. bwx-console will not wait for its "
-#~ "completion.\n"
-#~ msgstr ""
-#~ "Restaurar está programado para ejecutarse. bwx-consola no esperara a su "
-#~ "conclusión.\n"
-
-#~ msgid ""
-#~ "Restore is scheduled to run. bwx-console will not wait for its completion."
-#~ msgstr ""
-#~ "Restaurar está programado para ejecutarse. bwx-consola no esperara a su "
-#~ "conclusión."
-
 #~ msgid "Restore job created, but not yet running."
 #~ msgstr "Job de restauración creado, pero aún no se ejecuta."
 
@@ -19478,20 +19450,6 @@ msgstr "Console: nombre=%s\n"
 #~ "Job de restauración está esperando por jobs de mayor prioridad para "
 #~ "finalizar."
 
-#~ msgid ""
-#~ "The restore job has not been started within one minute, bwx-console will "
-#~ "not wait for its completion anymore.\n"
-#~ msgstr ""
-#~ "El Job de restauración no se ha iniciado en el plazo de un minuto, bwx-"
-#~ "console no va a esperar para su realización más.\n"
-
-#~ msgid ""
-#~ "The restore job has not been started within one minute, bwx-console will "
-#~ "not wait for its completion anymore."
-#~ msgstr ""
-#~ "El Job de restauración no se ha iniciado en el plazo de un minuto, bwx-"
-#~ "console no va a esperar para su realización más."
-
 #~ msgid "Restore done successfully.\n"
 #~ msgstr "Restauración finalizada con suceso.\n"
 
@@ -19658,12 +19616,6 @@ msgstr "Console: nombre=%s\n"
 #~ msgid "Possible completions: "
 #~ msgstr "Posibles complementos:"
 
-#~ msgid "Bacula bwx-console"
-#~ msgstr "Bacula bwx-console"
-
-#~ msgid "Welcome to bacula bwx-console %s (%s)!\n"
-#~ msgstr "Bienvenido a bacula bwx-console %s (%s)!\n"
-
 #~ msgid "&About...\tF1"
 #~ msgstr "&Acerca de...\tF1"
 
@@ -19703,28 +19655,6 @@ msgstr "Console: nombre=%s\n"
 #~ msgid "&Help"
 #~ msgstr "&Ayuda"
 
-#~ msgid ""
-#~ "Warning : Unicode is disabled because you are using wxWidgets for GTK+ "
-#~ "1.2.\n"
-#~ msgstr ""
-#~ "Advertencia: Unicode está deshabilitado porque está utilizando wxWidgets "
-#~ "para GTK+ 1.2.\n"
-
-#~ msgid ""
-#~ "Warning : There is a problem with wxWidgets for GTK+ 2.0 without Unicode "
-#~ "support when handling non-ASCII filenames: Every non-ASCII character in "
-#~ "such filenames will be replaced by an interrogation mark.\n"
-#~ "If this behaviour disturbs you, please build bwx-console against a "
-#~ "Unicode version of wxWidgets for GTK+ 2.0.\n"
-#~ "---\n"
-#~ msgstr ""
-#~ "Advertencia: Hay un problema con wxWidgets para GTK+ 2.0 sin el soporte "
-#~ "Unicode al manejar nombres de archivos no-ASCII: Cada carácter no-ASCII "
-#~ "en nombres de archivos será sustituido por un signo de interrogación.\n"
-#~ "Si este comportamiento te molesta, por favor construya bwx-consola para "
-#~ "una versión Unicode de wxWidgets para GTK+ 2.0.\n"
-#~ "---\n"
-
 #~ msgid "Send"
 #~ msgstr "Enviar"
 
@@ -19733,21 +19663,6 @@ msgstr "Console: nombre=%s\n"
 #~ "Error al analizar los argumentos de línea de comandos, usando valores por "
 #~ "defecto.\n"
 
-#~ msgid "Usage: bwx-console [-c configfile] [-w tmp]\n"
-#~ msgstr "Utilice: bwx-console [-c archivo_configuración] [-w tmp]\n"
-
-#~ msgid ""
-#~ "It seems that it is the first time you run bwx-console.\n"
-#~ "This file (%s) has been choosen as default configuration file.\n"
-#~ "Do you want to edit it? (if you click No you will have to select another "
-#~ "file)"
-#~ msgstr ""
-#~ "Parece que es la primera vez que ejecute bwx-consola.\n"
-#~ "Este archivo (%s) ha sido elegido como el archivo de configuración por "
-#~ "defecto.\n"
-#~ "¿Desea editar lo? (si hace clic en NO usted tendrá que seleccionar otro "
-#~ "archivo)"
-
 #~ msgid "First run"
 #~ msgstr "Primera ejecución"
 
@@ -19787,18 +19702,6 @@ msgstr "Console: nombre=%s\n"
 #~ msgid "Quitting.\n"
 #~ msgstr "Saliendo.\n"
 
-#~ msgid ""
-#~ "Welcome to Bacula bwx-console.\n"
-#~ "Written by Nicolas Boichat <nicolas@boichat.ch>\n"
-#~ "Copyright (C), 2005-2007 Free Software Foundation Europe, e.V.\n"
-#~ msgstr ""
-#~ "Bienvenido a Bacula bwx-console.\n"
-#~ "Escrito por Nicolas Boichat <nicolas@boichat.ch>\n"
-#~ "Copyright (C), 2005-2007 Free Software Foundation Europe, e.V.\n"
-
-#~ msgid "About Bacula bwx-console"
-#~ msgstr "Acerca de Bacula bwx-console"
-
 #~ msgid "Please choose your default configuration file"
 #~ msgstr "Por favor, seleccione su archivo de configuración por defecto"
 
@@ -19829,9 +19732,6 @@ msgstr "Console: nombre=%s\n"
 #~ msgid "Disconnected of the director."
 #~ msgstr "Desconectado al director."
 
-#~ msgid "bwx-console: unexpected director's question."
-#~ msgstr "bwx-console: inesperada consulta del director."
-
 #~ msgid "Using Device \"%s\"\n"
 #~ msgstr "Usando Dispositivo \"%s\"\n"
 
diff --git a/bacula/po/es_AR.po b/bacula/po/es_AR.po
index 1bc951e..efd60b2 100644
--- a/bacula/po/es_AR.po
+++ b/bacula/po/es_AR.po
@@ -557,7 +557,7 @@ msgstr ""
 #: src/console/authenticate.c:100 src/dird/authenticate.c:106
 #: src/dird/authenticate.c:206 src/filed/authenticate.c:119
 #: src/filed/authenticate.c:215 src/stored/authenticate.c:128
-#: src/stored/authenticate.c:232 src/wx-console/authenticate.c:106
+#: src/stored/authenticate.c:232
 msgid ""
 "Authorization problem: Remote server did not advertise required TLS "
 "support.\n"
@@ -566,26 +566,24 @@ msgstr ""
 #: src/console/authenticate.c:107 src/dird/authenticate.c:113
 #: src/dird/authenticate.c:213 src/filed/authenticate.c:127
 #: src/filed/authenticate.c:223 src/stored/authenticate.c:136
-#: src/stored/authenticate.c:240 src/wx-console/authenticate.c:112
+#: src/stored/authenticate.c:240
 msgid "Authorization problem: Remote server requires TLS.\n"
 msgstr ""
 
-#: src/console/authenticate.c:117 src/wx-console/authenticate.c:121
+#: src/console/authenticate.c:117
 msgid "TLS negotiation failed\n"
 msgstr ""
 
-#: src/console/authenticate.c:129 src/gnome2-console/authenticate.c:85
-#: src/tray-monitor/authenticate.c:87
+#: src/console/authenticate.c:129
 #, c-format
 msgid "Bad response to Hello command: ERR=%s\n"
 msgstr ""
 
-#: src/console/authenticate.c:136 src/gnome2-console/authenticate.c:95
-#: src/tray-monitor/authenticate.c:94 src/wx-console/authenticate.c:136
+#: src/console/authenticate.c:136
 msgid "Director rejected Hello command\n"
 msgstr ""
 
-#: src/console/authenticate.c:146 src/wx-console/authenticate.c:146
+#: src/console/authenticate.c:146
 msgid ""
 "Director authorization problem.\n"
 "Most likely the passwords do not agree.\n"
@@ -663,12 +661,11 @@ msgid ": is an illegal command\n"
 msgstr ""
 
 #: src/console/console.c:400 src/filed/filed.c:183
-#: src/gnome2-console/console.c:271
 msgid "TLS library initialization failed.\n"
 msgstr ""
 
 #: src/console/console.c:404 src/dird/dird.c:200 src/dird/dird.c:410
-#: src/dird/dird.c:413 src/filed/filed.c:188 src/gnome2-console/console.c:275
+#: src/dird/dird.c:413 src/filed/filed.c:188
 #: src/stored/stored.c:193
 #, c-format
 msgid "Please correct configuration file: %s\n"
@@ -692,19 +689,17 @@ msgstr ""
 msgid "You must enter a number between 1 and %d\n"
 msgstr ""
 
-#: src/console/console.c:455 src/tray-monitor/tray-monitor.c:858
+#: src/console/console.c:455
 #, c-format
 msgid "Connecting to Director %s:%d\n"
 msgstr ""
 
-#: src/console/console.c:471 src/gnome2-console/console.c:504
-#: src/wx-console/console_thread.cpp:370
+#: src/console/console.c:471
 #, c-format
 msgid "Failed to initialize TLS context for Console \"%s\".\n"
 msgstr ""
 
-#: src/console/console.c:492 src/gnome2-console/console.c:526
-#: src/wx-console/console_thread.cpp:391
+#: src/console/console.c:492
 #, c-format
 msgid "Failed to initialize TLS context for Director \"%s\".\n"
 msgstr ""
@@ -716,27 +711,25 @@ msgstr ""
 #: src/console/console.c:582 src/console/console.c:611 src/dird/dird.c:496
 #: src/dird/dird.c:711 src/dird/dird.c:777 src/dird/dird.c:829
 #: src/filed/filed.c:302 src/filed/filed.c:348
-#: src/gnome2-console/console.c:140 src/gnome2-console/console.c:169
-#: src/stored/stored.c:309 src/wx-console/console_thread.cpp:94
-#: src/wx-console/console_thread.cpp:120
+#: src/stored/stored.c:309
 msgid "TLS required but not configured in Bacula.\n"
 msgstr ""
 
-#: src/console/console.c:589 src/gnome2-console/console.c:147
+#: src/console/console.c:589
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Director \"%s\" in %s. At least one CA certificate store is required.\n"
 msgstr ""
 
-#: src/console/console.c:598 src/gnome2-console/console.c:156
+#: src/console/console.c:598
 #, c-format
 msgid ""
 "No Director resource defined in %s\n"
 "Without that I don't how to speak to the Director :-(\n"
 msgstr ""
 
-#: src/console/console.c:618 src/gnome2-console/console.c:176
+#: src/console/console.c:618
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -765,19 +758,17 @@ msgstr ""
 msgid "Cannot open file %s for output. ERR=%s\n"
 msgstr ""
 
-#: src/console/console_conf.c:123 src/gnome2-console/console_conf.c:122
-#: src/wx-console/console_conf.c:128
+#: src/console/console_conf.c:123
 #, c-format
 msgid "No record for %d %s\n"
 msgstr ""
 
-#: src/console/console_conf.c:132 src/wx-console/console_conf.c:137
+#: src/console/console_conf.c:132
 #, c-format
 msgid "Console: name=%s rcfile=%s histfile=%s\n"
 msgstr ""
 
-#: src/console/console_conf.c:136 src/gnome2-console/console_conf.c:131
-#: src/wx-console/console_conf.c:141
+#: src/console/console_conf.c:136
 #, c-format
 msgid "Director: name=%s address=%s DIRport=%d\n"
 msgstr ""
@@ -785,27 +776,20 @@ msgstr ""
 #: src/console/console_conf.c:140 src/console/console_conf.c:216
 #: src/console/console_conf.c:261 src/console/console_conf.c:288
 #: src/filed/filed_conf.c:268 src/filed/filed_conf.c:327
-#: src/filed/filed_conf.c:357 src/gnome2-console/console_conf.c:142
-#: src/gnome2-console/console_conf.c:220 src/gnome2-console/console_conf.c:268
-#: src/gnome2-console/console_conf.c:298 src/stored/stored_conf.c:510
+#: src/filed/filed_conf.c:357 src/stored/stored_conf.c:510
 #: src/stored/stored_conf.c:598 src/stored/stored_conf.c:633
-#: src/wx-console/console_conf.c:145 src/wx-console/console_conf.c:220
-#: src/wx-console/console_conf.c:265 src/wx-console/console_conf.c:292
 #, c-format
 msgid "Unknown resource type %d\n"
 msgstr ""
 
 #: src/console/console_conf.c:242 src/dird/dird_conf.c:1112
 #: src/dird/dird_conf.c:1127 src/filed/filed_conf.c:296
-#: src/gnome2-console/console_conf.c:246 src/tray-monitor/tray_conf.c:262
-#: src/wx-console/console_conf.c:246
 #, c-format
 msgid "%s item is required in %s resource, but not found.\n"
 msgstr ""
 
 #: src/console/console_conf.c:304 src/dird/dird_conf.c:1299
-#: src/filed/filed_conf.c:374 src/gnome2-console/console_conf.c:314
-#: src/tray-monitor/tray_conf.c:341 src/wx-console/console_conf.c:308
+#: src/filed/filed_conf.c:374
 #, c-format
 msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
 msgstr ""
@@ -855,7 +839,6 @@ msgid ""
 msgstr ""
 
 #: src/dird/authenticate.c:67 src/dird/authenticate.c:68
-#: src/tray-monitor/authenticate.c:121
 #, c-format
 msgid "Error sending Hello to Storage daemon. ERR=%s\n"
 msgstr ""
@@ -881,17 +864,16 @@ msgstr ""
 msgid "TLS negotiation failed.\n"
 msgstr ""
 
-#: src/dird/authenticate.c:132 src/tray-monitor/authenticate.c:134
+#: src/dird/authenticate.c:132
 #, c-format
 msgid "bdird<stored: bad response to Hello command: ERR=%s\n"
 msgstr ""
 
 #: src/dird/authenticate.c:139 src/dird/authenticate.c:140
-#: src/tray-monitor/authenticate.c:141
 msgid "Storage daemon rejected Hello command\n"
 msgstr ""
 
-#: src/dird/authenticate.c:167 src/tray-monitor/authenticate.c:166
+#: src/dird/authenticate.c:167
 #, c-format
 msgid "Error sending Hello to File daemon. ERR=%s\n"
 msgstr ""
@@ -911,13 +893,11 @@ msgid ""
 msgstr ""
 
 #: src/dird/authenticate.c:232 src/dird/authenticate.c:234
-#: src/tray-monitor/authenticate.c:179
 #, c-format
 msgid "Bad response from File daemon to Hello command: ERR=%s\n"
 msgstr ""
 
 #: src/dird/authenticate.c:241 src/dird/authenticate.c:242
-#: src/tray-monitor/authenticate.c:186
 msgid "File daemon rejected Hello command\n"
 msgstr ""
 
@@ -1351,7 +1331,7 @@ msgid ""
 "File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:443 src/tray-monitor/tray_conf.c:152
+#: src/dird/dird_conf.c:443
 #, c-format
 msgid "No %s resource defined\n"
 msgstr ""
@@ -1571,18 +1551,17 @@ msgstr ""
 msgid "      opcmd=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:786 src/tray-monitor/tray_conf.c:179
+#: src/dird/dird_conf.c:786
 #, c-format
 msgid "Unknown resource type %d in dump_resource.\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1080 src/tray-monitor/tray_conf.c:232
+#: src/dird/dird_conf.c:1080
 #, c-format
 msgid "Unknown resource type %d in free_resource.\n"
 msgstr ""
 
 #: src/dird/dird_conf.c:1118 src/lib/parse_conf.c:211
-#: src/tray-monitor/tray_conf.c:268
 #, c-format
 msgid "Too many items in %s resource\n"
 msgstr ""
@@ -1623,12 +1602,12 @@ msgstr ""
 msgid "Cannot find Schedule resource %s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1217 src/tray-monitor/tray_conf.c:287
+#: src/dird/dird_conf.c:1217
 #, c-format
 msgid "Unknown resource type %d in save_resource.\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1277 src/tray-monitor/tray_conf.c:322
+#: src/dird/dird_conf.c:1277
 #, c-format
 msgid "Unknown resource type %d in save_resrouce.\n"
 msgstr ""
@@ -1693,7 +1672,7 @@ msgstr ""
 msgid "Cannot destroy var context: ERR=%s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:73 src/tray-monitor/tray-monitor.c:867
+#: src/dird/fd_cmds.c:73
 msgid "File daemon"
 msgstr ""
 
@@ -2068,7 +2047,6 @@ msgid ""
 msgstr ""
 
 #: src/dird/msgchan.c:78 src/filed/job.c:1129
-#: src/tray-monitor/tray-monitor.c:874
 msgid "Storage daemon"
 msgstr ""
 
@@ -3410,7 +3388,7 @@ msgid "Enter a list of directories to restore for found JobIds"
 msgstr ""
 
 #: src/dird/ua_restore.c:297 src/dird/ua_status.c:713 src/filed/status.c:251
-#: src/stored/status.c:412 src/wx-console/wxbconfigpanel.cpp:191
+#: src/stored/status.c:412
 msgid "Cancel"
 msgstr ""
 
@@ -3917,53 +3895,23 @@ msgid "Level"
 msgstr ""
 
 #: src/dird/ua_run.c:642 src/dird/ua_select.c:152
-#: src/wx-console/wxbrestorepanel.cpp:321
-#: src/wx-console/wxbrestorepanel.cpp:337
-#: src/wx-console/wxbrestorepanel.cpp:458
-#: src/wx-console/wxbrestorepanel.cpp:459
-#: src/wx-console/wxbrestorepanel.cpp:469
-#: src/wx-console/wxbrestorepanel.cpp:470
-#: src/wx-console/wxbrestorepanel.cpp:1133
-#: src/wx-console/wxbrestorepanel.cpp:1794
-#: src/wx-console/wxbrestorepanel.cpp:1865
 msgid "Storage"
 msgstr ""
 
 #: src/dird/ua_run.c:645 src/dird/ua_select.c:282 src/dird/ua_select.c:391
-#: src/wx-console/wxbrestorepanel.cpp:318
-#: src/wx-console/wxbrestorepanel.cpp:336
-#: src/wx-console/wxbrestorepanel.cpp:410
-#: src/wx-console/wxbrestorepanel.cpp:411
-#: src/wx-console/wxbrestorepanel.cpp:421
-#: src/wx-console/wxbrestorepanel.cpp:422
-#: src/wx-console/wxbrestorepanel.cpp:669
-#: src/wx-console/wxbrestorepanel.cpp:1103
-#: src/wx-console/wxbrestorepanel.cpp:1190
-#: src/wx-console/wxbrestorepanel.cpp:1787
-#: src/wx-console/wxbrestorepanel.cpp:1789
-#: src/wx-console/wxbrestorepanel.cpp:1863
-#: src/wx-console/wxbrestorepanel.cpp:1918
 msgid "Client"
 msgstr ""
 
-#: src/dird/ua_run.c:646 src/wx-console/wxbrestorepanel.cpp:338
-#: src/wx-console/wxbrestorepanel.cpp:823
-#: src/wx-console/wxbrestorepanel.cpp:1867
+#: src/dird/ua_run.c:646
 msgid "When"
 msgstr ""
 
-#: src/dird/ua_run.c:647 src/wx-console/wxbrestorepanel.cpp:339
-#: src/wx-console/wxbrestorepanel.cpp:1096
-#: src/wx-console/wxbrestorepanel.cpp:1869
+#: src/dird/ua_run.c:647
 msgid "Priority"
 msgstr ""
 
 #: src/dird/ua_run.c:650 src/dird/ua_select.c:476 src/dird/ua_select.c:566
 #: src/dird/ua_update.c:400 src/dird/ua_update.c:475
-#: src/wx-console/wxbrestorepanel.cpp:320
-#: src/wx-console/wxbrestorepanel.cpp:506
-#: src/wx-console/wxbrestorepanel.cpp:516
-#: src/wx-console/wxbrestorepanel.cpp:1783
 msgid "Pool"
 msgstr ""
 
@@ -3971,24 +3919,15 @@ msgstr ""
 msgid "Verify Job"
 msgstr ""
 
-#: src/dird/ua_run.c:655 src/wx-console/wxbrestorepanel.cpp:331
-#: src/wx-console/wxbrestorepanel.cpp:1848
+#: src/dird/ua_run.c:655
 msgid "Bootstrap"
 msgstr ""
 
-#: src/dird/ua_run.c:656 src/wx-console/wxbrestorepanel.cpp:332
-#: src/wx-console/wxbrestorepanel.cpp:1072
-#: src/wx-console/wxbrestorepanel.cpp:1850
+#: src/dird/ua_run.c:656
 msgid "Where"
 msgstr ""
 
-#: src/dird/ua_run.c:657 src/wx-console/wxbrestorepanel.cpp:334
-#: src/wx-console/wxbrestorepanel.cpp:1080
-#: src/wx-console/wxbrestorepanel.cpp:1854
-#: src/wx-console/wxbrestorepanel.cpp:1855
-#: src/wx-console/wxbrestorepanel.cpp:1856
-#: src/wx-console/wxbrestorepanel.cpp:1857
-#: src/wx-console/wxbrestorepanel.cpp:1858
+#: src/dird/ua_run.c:657
 msgid "Replace"
 msgstr ""
 
@@ -4573,7 +4512,6 @@ msgstr ""
 
 #: src/dird/ua_status.c:716 src/filed/status.c:254 src/lib/util.c:187
 #: src/lib/util.c:254 src/stored/btape.c:1158 src/stored/status.c:415
-#: src/wx-console/wxbconfigpanel.cpp:180
 msgid "OK"
 msgstr ""
 
@@ -6253,370 +6191,10 @@ msgstr ""
 msgid "Cannot return to saved working directory: %s\n"
 msgstr ""
 
-#: src/gnome2-console/authenticate.c:74
-#, c-format
-msgid "%s: Director authorization problem.\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:75
-msgid "Director authorization problem.\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:77
-msgid ""
-"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for "
-"help.\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:87
-#, c-format
-msgid "%s: Bad response to Hello command: ERR=%s\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:89
-msgid "The Director is probably not running.\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:88
-#, c-format
-msgid ""
-"Copyright (C) 2002-2005 Kern Sibbald\n"
-"\n"
-"Version: %s (%s) %s %s %s\n"
-"\n"
-"Usage: gnome-console [-s] [-c config_file] [-d debug_level] [config_file]\n"
-"       -c <file>   set configuration file to file\n"
-"       -dnn        set debug level to nn\n"
-"       -s          no signals\n"
-"       -t          test - read configuration and exit\n"
-"       -?          print this message.\n"
-"\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:219
-#, c-format
-msgid "Pthread cond init error = %s\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:357
-msgid " Not Connected"
-msgstr ""
-
-#: src/gnome2-console/console.c:478
-#, c-format
-msgid " Connecting to Director %s:%d"
-msgstr ""
-
-#: src/gnome2-console/console.c:479
-#, c-format
-msgid ""
-"Connecting to Director %s:%d\n"
-"\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:494 src/wx-console/console_thread.cpp:360
-#, c-format
-msgid "Passphrase for Console \"%s\" TLS private key: "
-msgstr ""
-
-#: src/gnome2-console/console.c:516 src/wx-console/console_thread.cpp:381
-#, c-format
-msgid "Passphrase for Director \"%s\" TLS private key: "
-msgstr ""
-
-#: src/gnome2-console/console.c:535 src/tray-monitor/tray-monitor.c:860
-#: src/wx-console/console_thread.cpp:399
-msgid "Director daemon"
-msgstr ""
-
-#: src/gnome2-console/console.c:547
-msgid " Initializing ..."
-msgstr ""
-
-#: src/gnome2-console/console.c:583
-msgid " Connected"
-msgstr ""
-
-#: src/gnome2-console/console.c:591
-msgid " Processing command ..."
-msgstr ""
-
-#: src/gnome2-console/console.c:626
-msgid " At prompt waiting for input ..."
-msgstr ""
-
-#: src/gnome2-console/console.c:746
-msgid " Ready"
-msgstr ""
-
-#: src/gnome2-console/console_conf.c:135
-#, c-format
-msgid "Console: name=%s\n"
-msgstr ""
-
-#: src/gnome2-console/console_conf.c:138
-#, c-format
-msgid "ConsoleFont: name=%s font face=%s\n"
-msgstr ""
-
-#: src/gnome2-console/interface.c:32
-msgid "_Connect"
-msgstr ""
-
-#: src/gnome2-console/interface.c:33 src/gnome2-console/interface.c:232
-msgid "Connect to Director"
-msgstr ""
-
-#: src/gnome2-console/interface.c:39
-msgid "_Disconnect"
-msgstr ""
-
-#: src/gnome2-console/interface.c:40
-msgid "Disconnect from Director"
-msgstr ""
-
-#: src/gnome2-console/interface.c:93
-msgid "_Display Messages"
-msgstr ""
-
-#: src/gnome2-console/interface.c:129
-msgid "_File"
-msgstr ""
-
-#: src/gnome2-console/interface.c:136
-msgid "_Edit"
-msgstr ""
-
-#: src/gnome2-console/interface.c:143
-msgid "_View"
-msgstr ""
-
-#: src/gnome2-console/interface.c:144 src/gnome2-console/interface.c:252
-msgid "Display Messages"
-msgstr ""
-
-#: src/gnome2-console/interface.c:150
-msgid "_Settings"
-msgstr ""
-
-#: src/gnome2-console/interface.c:157
-msgid "_Help"
-msgstr ""
-
-#: src/gnome2-console/interface.c:197
-msgid "Bacula Console"
-msgstr ""
-
-#: src/gnome2-console/interface.c:231 src/wx-console/wxbmainframe.cpp:229
-#: src/wx-console/wxbmainframe.cpp:597
-msgid "Connect"
-msgstr ""
-
-#: src/gnome2-console/interface.c:241
-msgid "Run"
-msgstr ""
-
-#: src/gnome2-console/interface.c:242 src/gnome2-console/interface.c:677
-#: src/gnome2-console/interface.c:690
-msgid "Run a Job"
-msgstr ""
-
-#: src/gnome2-console/interface.c:251
-msgid "Msgs"
-msgstr ""
-
-#: src/gnome2-console/interface.c:261 src/lib/util.c:292
-#: src/wx-console/wxbrestorepanel.cpp:384
-#: src/wx-console/wxbrestorepanel.cpp:1949
+#: src/lib/util.c:292
 msgid "Restore"
 msgstr ""
 
-#: src/gnome2-console/interface.c:271
-msgid "Label"
-msgstr ""
-
-#: src/gnome2-console/interface.c:299
-msgid " Command: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:307
-msgid "Enter Commands Here"
-msgstr ""
-
-#: src/gnome2-console/interface.c:318
-msgid " Status: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:326
-msgid "  "
-msgstr ""
-
-#: src/gnome2-console/interface.c:422
-msgid "About Bacula Console"
-msgstr ""
-
-#: src/gnome2-console/interface.c:436
-msgid "Bacula Console\n"
-msgstr ""
-
-#: src/gnome2-console/interface.c:444
-msgid "Copyright (c) 2000 - 2004, Kern Sibbald and John Walker"
-msgstr ""
-
-#: src/gnome2-console/interface.c:450
-msgid "Authors: Kern Sibbald and John Walker"
-msgstr ""
-
-#: src/gnome2-console/interface.c:456
-msgid "The Leading Open Source Backup Solution."
-msgstr ""
-
-#: src/gnome2-console/interface.c:521 src/gnome2-console/interface.c:536
-msgid "Select Director"
-msgstr ""
-
-#: src/gnome2-console/interface.c:708 src/gnome2-console/interface.c:1616
-msgid "Job:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:728
-msgid "   Type:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:757 src/gnome2-console/interface.c:1644
-#: src/wx-console/wxbrestorepanel.cpp:1862
-msgid "Client:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:787 src/gnome2-console/interface.c:1672
-msgid "FileSet: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:813 src/wx-console/wxbrestorepanel.cpp:1868
-msgid "Priority:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:836
-msgid "Level:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:866 src/gnome2-console/interface.c:1418
-#: src/gnome2-console/interface.c:1700
-msgid "Pool:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:895 src/gnome2-console/interface.c:1393
-#: src/gnome2-console/interface.c:1728 src/wx-console/wxbrestorepanel.cpp:1864
-msgid "Storage:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:924
-msgid "Messages:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:952
-msgid "Where: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:970 src/wx-console/wxbrestorepanel.cpp:1866
-msgid "When:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:988 src/wx-console/wxbrestorepanel.cpp:1847
-msgid "Bootstrap:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1108
-msgid "_New"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1177
-msgid "Restore File Selection"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1226
-msgid "Current dir:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1252
-msgid "Files Selected: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:1373 src/gnome2-console/interface.c:1383
-msgid "Label a Volume"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1444
-msgid "Volume Name:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1459
-msgid "Slot:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1585
-msgid "Restore Files Dialog"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1599
-msgid "Restore Files"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1756
-msgid "Before:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1799
-msgid "Select Files"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1883
-msgid "Progress"
-msgstr ""
-
-#: src/gnome2-console/restore.c:121
-msgid "Mark"
-msgstr ""
-
-#: src/gnome2-console/restore.c:121
-msgid "File"
-msgstr ""
-
-#: src/gnome2-console/restore.c:121
-msgid "Mode"
-msgstr ""
-
-#: src/gnome2-console/restore.c:121 src/wx-console/wxbrestorepanel.cpp:288
-msgid "User"
-msgstr ""
-
-#: src/gnome2-console/restore.c:121 src/wx-console/wxbrestorepanel.cpp:292
-msgid "Group"
-msgstr ""
-
-#: src/gnome2-console/restore.c:121 src/wx-console/wxbrestorepanel.cpp:276
-msgid "Size"
-msgstr ""
-
-#: src/gnome2-console/restore.c:121 src/wx-console/wxbrestorepanel.cpp:280
-msgid "Date"
-msgstr ""
-
-#: src/gnome2-console/support.c:41
-#, c-format
-msgid "Widget not found: %s"
-msgstr ""
-
-#: src/gnome2-console/support.c:60 src/gnome2-console/support.c:85
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: src/gnome2-console/support.c:92
-#, c-format
-msgid "Failed to load pixbuf file: %s: %s\n"
-msgstr ""
-
 #: src/lib/tls.c:105
 #, c-format
 msgid ""
@@ -7270,20 +6848,6 @@ msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Director.\n"
 msgstr ""
 
-#: src/lib/lex.c:79 src/wx-console/console_thread.cpp:186
-#, c-format
-msgid "Problem probably begins at line %d.\n"
-msgstr ""
-
-#: src/lib/lex.c:84 src/wx-console/console_thread.cpp:191
-#, c-format
-msgid ""
-"Config error: %s\n"
-"            : line %d, col %d of file %s\n"
-"%s\n"
-"%s"
-msgstr ""
-
 #: src/lib/lex.c:88
 #, c-format
 msgid "Config error: %s\n"
@@ -13196,458 +12760,83 @@ msgstr ""
 msgid "Skip: File system change prohibited. Directory not entered. %s\n"
 msgstr ""
 
-#: src/tray-monitor/authenticate.c:78
-msgid ""
-"Director authorization problem.\n"
-"Most likely the passwords do not agree.\n"
-"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors "
-"for help.\n"
+#: src/baconfig.h:55
+#, c-format
+msgid "Failed ASSERT: %s\n"
 msgstr ""
 
-#: src/tray-monitor/authenticate.c:127
-msgid ""
-"Director and Storage daemon passwords or names not the same.\n"
-"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors "
-"for help.\n"
+#: src/baconfig.h:62
+msgid "*None*"
 msgstr ""
 
-#: src/tray-monitor/authenticate.c:172
-msgid ""
-"Director and File daemon passwords or names not the same.\n"
-"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors "
-"for help.\n"
+#: src/filed/win32/winmain.cpp:228 src/filed/win32/winmain.cpp:236
+msgid "Bacula Usage"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:102
-#, c-format
-msgid ""
-"Copyright (C) 2000-2004 Kern Sibbald and John Walker\n"
-"Written by Nicolas Boichat (2004)\n"
-"\n"
-"Version: %s (%s) %s %s %s\n"
-"\n"
-"Usage: tray-monitor [-c config_file] [-d debug_level]\n"
-"       -c <file>     set configuration file to file\n"
-"       -dnn          set debug level to nn\n"
-"       -t            test - read configuration and exit\n"
-"       -?            print this message.\n"
-"\n"
+#: src/filed/win32/winmain.cpp:233
+msgid "Bad Command Line Options"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:251
-#, c-format
-msgid ""
-"Error: %d Monitor resource defined in %s. You must define one and only one "
-"Monitor resource.\n"
+#: src/filed/win32/winmain.cpp:326
+msgid "Another instance of Bacula is already running"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:282
-#, c-format
-msgid ""
-"No Client, Storage nor Director resource defined in %s\n"
-"Without that I don't how to get status from the File, Storage or Director "
-"Daemon :-(\n"
+#: src/filed/win32/winservice.cpp:131 src/filed/win32/winservice.cpp:145
+msgid "No existing instance of Bacula could be contacted"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:304
-#, c-format
-msgid ""
-"Invalid refresh interval defined in %s\n"
-"This value must be greater or equal to 1 second and less or equal to 10 "
-"minutes (read value: %d).\n"
+#: src/filed/win32/winservice.cpp:218
+msgid "KERNEL32.DLL not found: Bacula service not started"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:319
-msgid "Open status window..."
+#: src/filed/win32/winservice.cpp:228
+msgid "Registry service not found: Bacula service not started"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:325
-msgid "Exit"
+#: src/filed/win32/winservice.cpp:230
+msgid "Registry service not found"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:337
-msgid "Bacula tray monitor"
+#: src/filed/win32/winservice.cpp:260
+msgid "StartServiceCtrlDispatcher failed."
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:362
-msgid " (DIR)"
+#: src/filed/win32/winservice.cpp:278
+msgid "RegisterServiceCtlHandler failed"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:366
-msgid " (FD)"
+#: src/filed/win32/winservice.cpp:279
+msgid "Contact Register Service Handler failure"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:370
-msgid " (SD)"
+#: src/filed/win32/winservice.cpp:295
+msgid "ReportStatus STOPPED failed 1"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:383
-msgid "Unknown status."
+#: src/filed/win32/winservice.cpp:318
+msgid "Report Service failure"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:424
-msgid "Refresh interval in seconds: "
+#: src/filed/win32/winservice.cpp:355
+msgid "Unable to install Bacula service"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:432
-msgid "Refresh now"
+#: src/filed/win32/winservice.cpp:373
+msgid "Service command length too long"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:436
-msgid "About"
+#: src/filed/win32/winservice.cpp:374
+msgid "Service command length too long. Service not registered."
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:440
-msgid "Close"
+#: src/filed/win32/winservice.cpp:389
+msgid "Cannot write System Registry"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:460
-#, c-format
-msgid "Disconnecting from Director %s:%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:463
-#, c-format
-msgid "Disconnecting from Client %s:%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:466
-#, c-format
-msgid "Disconnecting from Storage %s:%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:502 src/tray-monitor/tray-monitor.c:512
-msgid "Bacula Tray Monitor"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:503 src/tray-monitor/tray-monitor.c:513
-msgid ""
-"Copyright (C) 2004-2005 Kern Sibbald\n"
-"Written by Nicolas Boichat\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:505 src/tray-monitor/tray-monitor.c:515
-msgid "Version:"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:583
-#, c-format
-msgid "Error, currentitem is not a Client or a Storage..\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:656
-#, c-format
-msgid ""
-"Current job: %s\n"
-"Last job: %s"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:668
-#, c-format
-msgid " (%d errors)"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:671
-#, c-format
-msgid " (%d error)"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:708
-msgid "No current job."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:711
-msgid "No last job."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:719
-msgid "Job status: Created"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:724
-msgid "Job status: Running"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:728
-msgid "Job status: Blocked"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:733
-msgid "Job status: Terminated"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:738
-msgid "Job status: Terminated in error"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:744
-msgid "Job status: Error"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:748
-msgid "Job status: Fatal error"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:753
-msgid "Job status: Verify differences"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:758
-msgid "Job status: Canceled"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:763
-msgid "Job status: Waiting on File daemon"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:768
-msgid "Job status: Waiting on the Storage daemon"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:773
-msgid "Job status: Waiting for new media"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:778
-msgid "Job status: Waiting for Mount"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:783
-msgid "Job status: Waiting for storage resource"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:788
-msgid "Job status: Waiting for job resource"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:793
-msgid "Job status: Waiting for Client resource"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:798
-msgid "Job status: Waiting for maximum jobs"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:803
-msgid "Job status: Waiting for start time"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:808
-msgid "Job status: Waiting for higher priority jobs to finish"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:813
-#, c-format
-msgid "Unknown job status %c."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:814
-#, c-format
-msgid "Job status: Unknown(%c)"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:821
-#, c-format
-msgid "Bad scan : '%s' %d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:859
-#, c-format
-msgid "Connecting to Director %s:%d"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:865
-#, c-format
-msgid "Connecting to Client %s:%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:866
-#, c-format
-msgid "Connecting to Client %s:%d"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:872
-#, c-format
-msgid "Connecting to Storage %s:%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:873
-#, c-format
-msgid "Connecting to Storage %s:%d"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:878 src/tray-monitor/tray-monitor.c:916
-#, c-format
-msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:884
-msgid "Cannot connect to daemon.\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:885
-msgid "Cannot connect to daemon."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:897
-#, c-format
-msgid "Authentication error : %s"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:904
-msgid "Opened connection with Director daemon.\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:905
-msgid "Opened connection with Director daemon."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:908
-msgid "Opened connection with File daemon.\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:909
-msgid "Opened connection with File daemon."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:912
-msgid "Opened connection with Storage daemon.\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:913
-msgid "Opened connection with Storage daemon."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:948
-msgid "<< Error: BNET_PROMPT signal received. >>\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:953 src/wx-console/console_thread.cpp:465
-msgid "<< Heartbeat signal received, answered. >>\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:957
-#, c-format
-msgid "<< Unexpected signal received : %s >>\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:962
-msgid "<ERROR>\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:966
-msgid "Error : BNET_HARDEOF or BNET_ERROR"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:972
-msgid "<STOP>\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:976
-msgid "Error : Connection closed."
-msgstr ""
-
-#: src/tray-monitor/tray_conf.c:161
-#, c-format
-msgid "Monitor: name=%s FDtimeout=%s SDtimeout=%s\n"
-msgstr ""
-
-#: src/tray-monitor/tray_conf.c:167
-#, c-format
-msgid "Director: name=%s address=%s FDport=%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray_conf.c:171
-#, c-format
-msgid "Client: name=%s address=%s FDport=%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray_conf.c:175
-#, c-format
-msgid "Storage: name=%s address=%s SDport=%d\n"
-msgstr ""
-
-#: src/wx-console/authenticate.c:129
-msgid "Bad response to Hello command: ERR="
-msgstr ""
-
-#: src/baconfig.h:55
-#, c-format
-msgid "Failed ASSERT: %s\n"
-msgstr ""
-
-#: src/baconfig.h:62
-msgid "*None*"
-msgstr ""
-
-#: src/filed/win32/winmain.cpp:228 src/filed/win32/winmain.cpp:236
-msgid "Bacula Usage"
-msgstr ""
-
-#: src/filed/win32/winmain.cpp:233
-msgid "Bad Command Line Options"
-msgstr ""
-
-#: src/filed/win32/winmain.cpp:326
-msgid "Another instance of Bacula is already running"
-msgstr ""
-
-#: src/filed/win32/winservice.cpp:131 src/filed/win32/winservice.cpp:145
-msgid "No existing instance of Bacula could be contacted"
-msgstr ""
-
-#: src/filed/win32/winservice.cpp:218
-msgid "KERNEL32.DLL not found: Bacula service not started"
-msgstr ""
-
-#: src/filed/win32/winservice.cpp:228
-msgid "Registry service not found: Bacula service not started"
-msgstr ""
-
-#: src/filed/win32/winservice.cpp:230
-msgid "Registry service not found"
-msgstr ""
-
-#: src/filed/win32/winservice.cpp:260
-msgid "StartServiceCtrlDispatcher failed."
-msgstr ""
-
-#: src/filed/win32/winservice.cpp:278
-msgid "RegisterServiceCtlHandler failed"
-msgstr ""
-
-#: src/filed/win32/winservice.cpp:279
-msgid "Contact Register Service Handler failure"
-msgstr ""
-
-#: src/filed/win32/winservice.cpp:295
-msgid "ReportStatus STOPPED failed 1"
-msgstr ""
-
-#: src/filed/win32/winservice.cpp:318
-msgid "Report Service failure"
-msgstr ""
-
-#: src/filed/win32/winservice.cpp:355
-msgid "Unable to install Bacula service"
-msgstr ""
-
-#: src/filed/win32/winservice.cpp:373
-msgid "Service command length too long"
-msgstr ""
-
-#: src/filed/win32/winservice.cpp:374
-msgid "Service command length too long. Service not registered."
-msgstr ""
-
-#: src/filed/win32/winservice.cpp:389
-msgid "Cannot write System Registry"
-msgstr ""
-
-#: src/filed/win32/winservice.cpp:390
-msgid ""
-"The System Registry could not be updated - the Bacula service was not "
-"installed"
+#: src/filed/win32/winservice.cpp:390
+msgid ""
+"The System Registry could not be updated - the Bacula service was not "
+"installed"
 msgstr ""
 
 #: src/filed/win32/winservice.cpp:397
@@ -13752,714 +12941,3 @@ msgstr ""
 #: src/filed/win32/winservice.cpp:740
 msgid "Could not lock database"
 msgstr ""
-
-#: src/wx-console/console_thread.cpp:101
-#, c-format
-msgid ""
-"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
-"Director \"%s\" in config file.\n"
-"At least one CA certificate store is required.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:108
-msgid ""
-"No Director resource defined in config file.\n"
-"Without that I don't how to speak to the Director :-(\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:127
-#, c-format
-msgid ""
-"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
-"Console \"%s\" in config file.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:148
-msgid "Error while initializing windows sockets...\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:163
-msgid "Error while cleaning up windows sockets...\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:201
-msgid "Error while initializing library."
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:227
-msgid "Cryptographic library initialization failed.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:231
-msgid "Please correct configuration file.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:273
-msgid "Error : Library not initialized\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:284
-msgid "Error : No configuration file loaded\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:294
-msgid "Connecting...\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:310
-msgid "Error : No director defined in config file.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:322
-msgid "Multiple directors found in your config file.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:331
-#, c-format
-msgid "Please choose a director (1-%d): "
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:403
-msgid "Failed to connect to the director\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:413
-msgid "Connected\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:470
-msgid "<< Unexpected signal received : "
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:490
-msgid "Connection terminated\n"
-msgstr ""
-
-#: src/wx-console/main.cpp:101
-msgid "Bacula wx-console"
-msgstr ""
-
-#: src/wx-console/main.cpp:106 src/wx-console/wxbmainframe.cpp:248
-#, c-format
-msgid "Welcome to bacula wx-console %s (%s)!\n"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:44
-msgid "Config file editor"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:54
-msgid "# Bacula wx-console Configuration File\n"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:90
-msgid "Save and close"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:91
-msgid "Close without saving"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:118
-#, c-format
-msgid "Unable to write to %s\n"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:119
-msgid "Error while saving"
-msgstr ""
-
-#: src/wx-console/wxbconfigpanel.cpp:184
-msgid "Apply"
-msgstr ""
-
-#: src/wx-console/wxbhistorytextctrl.cpp:61
-#: src/wx-console/wxbhistorytextctrl.cpp:132
-#: src/wx-console/wxbmainframe.cpp:272
-msgid "Type your command below:"
-msgstr ""
-
-#: src/wx-console/wxbhistorytextctrl.cpp:96
-msgid "Unknown command."
-msgstr ""
-
-#: src/wx-console/wxbhistorytextctrl.cpp:105
-msgid "Possible completions: "
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:227
-msgid "&About...\tF1"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:227
-msgid "Show about dialog"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:229 src/wx-console/wxbmainframe.cpp:598
-msgid "Connect to the director"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:230
-msgid "Disconnect"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:230
-msgid "Disconnect of the director"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:232
-msgid "Change of configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:232
-msgid "Change your default configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:233
-msgid "Edit your configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:235
-msgid "E&xit\tAlt-X"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:235
-msgid "Quit this program"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:239
-msgid "&File"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:240
-msgid "&Help"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:257
-msgid "Console"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:264
-msgid ""
-"Warning : Unicode is disabled because you are using wxWidgets for GTK+ 1.2.\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:268
-msgid ""
-"Warning : There is a problem with wxWidgets for GTK+ 2.0 without Unicode "
-"support when handling non-ASCII filenames: Every non-ASCII character in such "
-"filenames will be replaced by an interrogation mark.\n"
-"If this behaviour disturbs you, please build wx-console against a Unicode "
-"version of wxWidgets for GTK+ 2.0.\n"
-"---\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:279
-msgid "Send"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:356 src/wx-console/wxbmainframe.cpp:368
-msgid "Error while parsing command line arguments, using defaults.\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:357 src/wx-console/wxbmainframe.cpp:369
-msgid "Usage: wx-console [-c configfile] [-w tmp]\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:397
-#, c-format
-msgid ""
-"It seems that it is the first time you run wx-console.\n"
-"This file (%s) has been choosen as default configuration file.\n"
-"Do you want to edit it? (if you click No you will have to select another "
-"file)"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:399
-msgid "First run"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:416
-#, c-format
-msgid ""
-"Unable to read %s\n"
-"Error: %s\n"
-"Do you want to choose another one? (Press no to edit this file)"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:418
-msgid "Unable to read configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:430
-msgid "Please choose a configuration file to use"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:443
-msgid "This configuration file has been successfully read, use it as default?"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:444
-msgid "Configuration file read successfully"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:454
-#, c-format
-msgid "Using this configuration file: %s\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:459
-msgid "Connecting to the director..."
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:474
-msgid "Failed to unregister a data parser !"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:482
-msgid "Quitting.\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:497
-msgid ""
-"Welcome to Bacula wx-console.\n"
-"Written by Nicolas Boichat <nicolas@boichat.ch>\n"
-"(C) 2005 Kern Sibbald\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:499
-msgid "About Bacula wx-console"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:505
-msgid "Please choose your default configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:509
-msgid "Use this configuration file as default?"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:510
-msgid "Configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:581
-msgid "Console thread terminated."
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:589
-msgid "Connection to the director lost. Quit program?"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:590
-msgid "Connection lost"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:606
-msgid "Connected to the director."
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:629
-msgid "Reconnect"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:630
-msgid "Reconnect to the director"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:644
-msgid "Disconnected of the director."
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:663 src/wx-console/wxbrestorepanel.cpp:689
-msgid "Unexpected question has been received.\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:686 src/wx-console/wxbmainframe.cpp:703
-msgid "wx-console: unexpected director's question."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:216
-#: src/wx-console/wxbrestorepanel.cpp:1895
-#: src/wx-console/wxbrestorepanel.cpp:1924
-msgid "Enter restore mode"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:219
-msgid "Cancel restore"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:245
-#: src/wx-console/wxbrestorepanel.cpp:299
-msgid "Add"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:247
-#: src/wx-console/wxbrestorepanel.cpp:301
-msgid "Remove"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:249
-#: src/wx-console/wxbrestorepanel.cpp:303
-msgid "Refresh"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:268
-msgid "M"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:272
-msgid "Filename"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:284
-msgid "Perm."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:317
-#: src/wx-console/wxbrestorepanel.cpp:330
-#: src/wx-console/wxbrestorepanel.cpp:482
-#: src/wx-console/wxbrestorepanel.cpp:492
-#: src/wx-console/wxbrestorepanel.cpp:495
-#: src/wx-console/wxbrestorepanel.cpp:1760
-#: src/wx-console/wxbrestorepanel.cpp:1846
-msgid "Job Name"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:319
-#: src/wx-console/wxbrestorepanel.cpp:335
-#: src/wx-console/wxbrestorepanel.cpp:434
-#: src/wx-console/wxbrestorepanel.cpp:435
-#: src/wx-console/wxbrestorepanel.cpp:445
-#: src/wx-console/wxbrestorepanel.cpp:446
-#: src/wx-console/wxbrestorepanel.cpp:1118
-#: src/wx-console/wxbrestorepanel.cpp:1191
-#: src/wx-console/wxbrestorepanel.cpp:1798
-#: src/wx-console/wxbrestorepanel.cpp:1800
-#: src/wx-console/wxbrestorepanel.cpp:1861
-msgid "Fileset"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:322
-#: src/wx-console/wxbrestorepanel.cpp:1185
-#: src/wx-console/wxbrestorepanel.cpp:1201
-#: src/wx-console/wxbrestorepanel.cpp:1203
-#: src/wx-console/wxbrestorepanel.cpp:1211
-#: src/wx-console/wxbrestorepanel.cpp:1213
-#: src/wx-console/wxbrestorepanel.cpp:1232
-#: src/wx-console/wxbrestorepanel.cpp:1239
-#: src/wx-console/wxbrestorepanel.cpp:1788
-#: src/wx-console/wxbrestorepanel.cpp:1799
-#: src/wx-console/wxbrestorepanel.cpp:1919
-msgid "Before"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:324
-msgid "Please configure parameters concerning files to restore :"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:333
-#: src/wx-console/wxbrestorepanel.cpp:1854
-msgid "always"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:333
-msgid "if newer"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:333
-msgid "if older"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:333
-#: src/wx-console/wxbrestorepanel.cpp:1857
-msgid "never"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:341
-msgid "Please configure parameters concerning files restoration :"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:406
-msgid "Getting parameters list."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:414
-msgid "Error : no clients returned by the director."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:438
-msgid "Error : no filesets returned by the director."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:462
-msgid "Error : no storage returned by the director."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:485
-#: src/wx-console/wxbrestorepanel.cpp:509
-msgid "Error : no jobs returned by the director."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:495
-msgid "RestoreFiles"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:530
-msgid "Please configure your restore parameters."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:541
-msgid "Building restore tree..."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:584
-msgid "Error while starting restore: "
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:674
-msgid ""
-"Right click on a file or on a directory, or double-click on its mark to add "
-"it to the restore list."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:711
-#: src/wx-console/wxbrestorepanel.cpp:733
-msgid "wx-console: unexpected restore question."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:744
-msgid " files selected to be restored."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:749
-msgid " file selected to be restored."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:756
-#, c-format
-msgid "Please configure your restore (%ld files selected to be restored)..."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:766
-msgid "Restore failed : no file selected.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:767
-msgid "Restore failed : no file selected."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:777
-msgid "Restoring, please wait..."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:790
-msgid "Job started. JobId="
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:792
-msgid "Restore started, jobid="
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:796
-msgid "Job failed."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:797
-msgid "Restore failed, please look at messages.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:798
-msgid "Restore failed, please look at messages in console."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:804
-#: src/wx-console/wxbrestorepanel.cpp:805
-msgid "Failed to retrieve jobid.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:831
-msgid ""
-"Restore is scheduled in more than two minutes, wx-console will not wait for "
-"its completion.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:832
-msgid ""
-"Restore is scheduled in more than two minutes, wx-console will not wait for "
-"its completion."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:858
-msgid "Restore job created, but not yet running."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:863
-#, c-format
-msgid "Restore job running, please wait (%ld of %ld files restored)..."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:867
-msgid "Restore job terminated successfully."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:868
-msgid "Restore job terminated successfully.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:873
-msgid "Restore job terminated in error, see messages in console."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:874
-msgid "Restore job terminated in error, see messages.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:879
-msgid "Restore job reported a non-fatal error."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:883
-msgid "Restore job reported a fatal error."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:888
-msgid "Restore job cancelled by user."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:889
-msgid "Restore job cancelled by user.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:894
-msgid "Restore job is waiting on File daemon."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:898
-msgid "Restore job is waiting for new media."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:902
-msgid "Restore job is waiting for storage resource."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:906
-msgid "Restore job is waiting for job resource."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:910
-msgid "Restore job is waiting for Client resource."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:914
-msgid "Restore job is waiting for maximum jobs."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:918
-msgid "Restore job is waiting for start time."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:922
-msgid "Restore job is waiting for higher priority jobs to finish."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:971
-msgid ""
-"The restore job has not been started within one minute, wx-console will not "
-"wait for its completion anymore.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:972
-msgid ""
-"The restore job has not been started within one minute, wx-console will not "
-"wait for its completion anymore."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:982
-msgid "Restore done successfully.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:983
-msgid "Restore done successfully."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1054
-msgid "Applying restore configuration changes..."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1105
-msgid "Failed to find the selected client."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1120
-msgid "Failed to find the selected fileset."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1135
-msgid "Failed to find the selected storage."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1152
-#: src/wx-console/wxbrestorepanel.cpp:1835
-msgid "Run Restore job"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1168
-msgid "Restore configuration changes were applied."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1177
-msgid "Restore cancelled.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1178
-msgid "Restore cancelled."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1200
-msgid "No results to list."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1202
-msgid "No backup found for this client."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1209
-msgid "ERROR"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1210
-msgid "Query failed"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1212
-msgid "Cannot get previous backups list, see console."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1845
-msgid "JobName:"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1849
-msgid "Where:"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1852
-msgid "Replace:"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1855
-msgid "ifnewer"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1856
-msgid "ifolder"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1860
-msgid "FileSet:"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1976
-msgid "Restoring..."
-msgstr ""
diff --git a/bacula/po/fi.po b/bacula/po/fi.po
index aa515ca..7d7589d 100644
--- a/bacula/po/fi.po
+++ b/bacula/po/fi.po
@@ -609,7 +609,6 @@ msgid ""
 msgstr ""
 
 #: src/dird/authenticate.c:80 src/dird/authenticate.c:81
-#: src/tray-monitor/authenticate.c:132
 #, c-format
 msgid "Error sending Hello to Storage daemon. ERR=%s\n"
 msgstr ""
@@ -632,7 +631,7 @@ msgstr ""
 
 #: src/dird/authenticate.c:120 src/console/authenticate.c:114
 #: src/filed/authenticate.c:251 src/stored/authenticate.c:131
-#: src/stored/authenticate.c:232 src/wx-console/authenticate.c:127
+#: src/stored/authenticate.c:232
 msgid ""
 "Authorization problem: Remote server did not advertise required TLS "
 "support.\n"
@@ -641,7 +640,6 @@ msgstr ""
 #: src/dird/authenticate.c:127 src/console/authenticate.c:121
 #: src/filed/authenticate.c:147 src/filed/authenticate.c:259
 #: src/stored/authenticate.c:139 src/stored/authenticate.c:240
-#: src/wx-console/authenticate.c:133
 msgid "Authorization problem: Remote server requires TLS.\n"
 msgstr ""
 
@@ -655,7 +653,7 @@ msgstr ""
 msgid "bdird<stored: \"%s:%s\" bad response to Hello command: ERR=%s\n"
 msgstr ""
 
-#: src/dird/authenticate.c:152 src/tray-monitor/authenticate.c:152
+#: src/dird/authenticate.c:152
 msgid "Storage daemon rejected Hello command\n"
 msgstr ""
 
@@ -700,7 +698,7 @@ msgstr ""
 msgid "TLS negotiation failed with FD at \"%s:%d\".\n"
 msgstr ""
 
-#: src/dird/authenticate.c:250 src/tray-monitor/authenticate.c:191
+#: src/dird/authenticate.c:250
 #, c-format
 msgid "Bad response from File daemon to Hello command: ERR=%s\n"
 msgstr ""
@@ -710,7 +708,7 @@ msgstr ""
 msgid "Bad response from File daemon at \"%s:%d\" to Hello command: ERR=%s\n"
 msgstr ""
 
-#: src/dird/authenticate.c:259 src/tray-monitor/authenticate.c:198
+#: src/dird/authenticate.c:259
 msgid "File daemon rejected Hello command\n"
 msgstr ""
 
@@ -1037,13 +1035,13 @@ msgid ""
 msgstr ""
 
 #: src/dird/dird.c:224 src/console/console.c:426 src/filed/filed.c:182
-#: src/gnome2-console/console.c:286 src/stored/stored.c:210
+#: src/stored/stored.c:210
 msgid "Cryptography library initialization failed.\n"
 msgstr ""
 
 #: src/dird/dird.c:228 src/dird/dird.c:234 src/dird/dird.c:474
 #: src/dird/dird.c:477 src/console/console.c:430 src/filed/filed.c:187
-#: src/gnome2-console/console.c:290 src/stored/stored.c:214
+#: src/stored/stored.c:214
 #, c-format
 msgid "Please correct configuration file: %s\n"
 msgstr ""
@@ -1080,9 +1078,7 @@ msgstr ""
 #: src/dird/dird.c:563 src/dird/dird.c:764 src/dird/dird.c:816
 #: src/dird/dird.c:920 src/console/console.c:657 src/console/console.c:686
 #: src/filed/filed.c:288 src/filed/filed.c:446
-#: src/gnome2-console/console.c:153 src/gnome2-console/console.c:182
-#: src/stored/stored.c:332 src/wx-console/console_thread.cpp:114
-#: src/wx-console/console_thread.cpp:140
+#: src/stored/stored.c:332
 msgid "TLS required but not configured in Bacula.\n"
 msgstr ""
 
@@ -1185,7 +1181,7 @@ msgstr ""
 msgid "Failed to initialize TLS context for Storage \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:508 src/tray-monitor/tray_conf.c:168
+#: src/dird/dird_conf.c:508
 #, c-format
 msgid "No %s resource defined\n"
 msgstr ""
@@ -1459,26 +1455,24 @@ msgstr ""
 msgid "      opcmd=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:893 src/tray-monitor/tray_conf.c:199
+#: src/dird/dird_conf.c:893
 #, c-format
 msgid "Unknown resource type %d in dump_resource.\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1199 src/tray-monitor/tray_conf.c:257
+#: src/dird/dird_conf.c:1199
 #, c-format
 msgid "Unknown resource type %d in free_resource.\n"
 msgstr ""
 
 #: src/dird/dird_conf.c:1231 src/dird/dird_conf.c:1246
 #: src/dird/dird_conf.c:1842 src/console/console_conf.c:257
-#: src/filed/filed_conf.c:347 src/gnome2-console/console_conf.c:258
-#: src/tray-monitor/tray_conf.c:288 src/wx-console/console_conf.c:265
+#: src/filed/filed_conf.c:347
 #, c-format
 msgid "%s item is required in %s resource, but not found.\n"
 msgstr ""
 
 #: src/dird/dird_conf.c:1237 src/lib/parse_conf.c:234
-#: src/tray-monitor/tray_conf.c:294
 #, c-format
 msgid "Too many items in %s resource\n"
 msgstr ""
@@ -1525,7 +1519,6 @@ msgid "Cannot find Schedule resource %s\n"
 msgstr ""
 
 #: src/dird/dird_conf.c:1383 src/dird/dird_conf.c:1443
-#: src/tray-monitor/tray_conf.c:314 src/tray-monitor/tray_conf.c:352
 #, c-format
 msgid "Unknown resource type %d in save_resource.\n"
 msgstr ""
@@ -1536,8 +1529,7 @@ msgid "Name item is required in %s resource, but not found.\n"
 msgstr ""
 
 #: src/dird/dird_conf.c:1466 src/console/console_conf.c:320
-#: src/filed/filed_conf.c:432 src/gnome2-console/console_conf.c:327
-#: src/tray-monitor/tray_conf.c:372 src/wx-console/console_conf.c:328
+#: src/filed/filed_conf.c:432
 #, c-format
 msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
 msgstr ""
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "Cannot destroy var context: ERR=%s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:94 src/tray-monitor/tray-monitor.c:914
+#: src/dird/fd_cmds.c:94
 msgid "File daemon"
 msgstr ""
 
@@ -2229,7 +2221,6 @@ msgid "Storage from Pool's NextPool resource"
 msgstr ""
 
 #: src/dird/msgchan.c:106 src/filed/job.c:1301
-#: src/tray-monitor/tray-monitor.c:921
 msgid "Storage daemon"
 msgstr ""
 
@@ -2964,33 +2955,12 @@ msgid "Director"
 msgstr ""
 
 #: src/dird/ua_cmds.c:998 src/dird/ua_dotcmds.c:284 src/dird/ua_run.c:265
-#: src/dird/ua_select.c:168 src/wx-console/wxbrestorepanel.cpp:339
-#: src/wx-console/wxbrestorepanel.cpp:355
-#: src/wx-console/wxbrestorepanel.cpp:479
-#: src/wx-console/wxbrestorepanel.cpp:480
-#: src/wx-console/wxbrestorepanel.cpp:490
-#: src/wx-console/wxbrestorepanel.cpp:491
-#: src/wx-console/wxbrestorepanel.cpp:1154
-#: src/wx-console/wxbrestorepanel.cpp:1818
-#: src/wx-console/wxbrestorepanel.cpp:1889
+#: src/dird/ua_select.c:168
 msgid "Storage"
 msgstr ""
 
 #: src/dird/ua_cmds.c:999 src/dird/ua_dotcmds.c:285 src/dird/ua_run.c:271
 #: src/dird/ua_select.c:311 src/dird/ua_select.c:420
-#: src/wx-console/wxbrestorepanel.cpp:336
-#: src/wx-console/wxbrestorepanel.cpp:354
-#: src/wx-console/wxbrestorepanel.cpp:431
-#: src/wx-console/wxbrestorepanel.cpp:432
-#: src/wx-console/wxbrestorepanel.cpp:442
-#: src/wx-console/wxbrestorepanel.cpp:443
-#: src/wx-console/wxbrestorepanel.cpp:690
-#: src/wx-console/wxbrestorepanel.cpp:1124
-#: src/wx-console/wxbrestorepanel.cpp:1211
-#: src/wx-console/wxbrestorepanel.cpp:1811
-#: src/wx-console/wxbrestorepanel.cpp:1813
-#: src/wx-console/wxbrestorepanel.cpp:1887
-#: src/wx-console/wxbrestorepanel.cpp:1943
 msgid "Client"
 msgstr ""
 
@@ -3704,7 +3674,7 @@ msgid "Enter a list of directories to restore for found JobIds"
 msgstr ""
 
 #: src/dird/ua_restore.c:418 src/dird/ua_status.c:760 src/filed/status.c:256
-#: src/stored/status.c:521 src/wx-console/wxbconfigpanel.cpp:212
+#: src/stored/status.c:521
 msgid "Cancel"
 msgstr ""
 
@@ -3998,23 +3968,16 @@ msgstr ""
 msgid "Restore Client"
 msgstr ""
 
-#: src/dird/ua_run.c:273 src/wx-console/wxbrestorepanel.cpp:356
-#: src/wx-console/wxbrestorepanel.cpp:844
-#: src/wx-console/wxbrestorepanel.cpp:1891
+#: src/dird/ua_run.c:273
 msgid "When"
 msgstr ""
 
-#: src/dird/ua_run.c:274 src/wx-console/wxbrestorepanel.cpp:357
-#: src/wx-console/wxbrestorepanel.cpp:1117
-#: src/wx-console/wxbrestorepanel.cpp:1894
+#: src/dird/ua_run.c:274
 msgid "Priority"
 msgstr ""
 
 #: src/dird/ua_run.c:278 src/dird/ua_select.c:506 src/dird/ua_select.c:596
-#: src/dird/ua_update.c:529 src/wx-console/wxbrestorepanel.cpp:338
-#: src/wx-console/wxbrestorepanel.cpp:527
-#: src/wx-console/wxbrestorepanel.cpp:537
-#: src/wx-console/wxbrestorepanel.cpp:1807
+#: src/dird/ua_update.c:529
 msgid "Pool"
 msgstr ""
 
@@ -4022,14 +3985,11 @@ msgstr ""
 msgid "Verify Job"
 msgstr ""
 
-#: src/dird/ua_run.c:283 src/wx-console/wxbrestorepanel.cpp:349
-#: src/wx-console/wxbrestorepanel.cpp:1872
+#: src/dird/ua_run.c:283
 msgid "Bootstrap"
 msgstr ""
 
-#: src/dird/ua_run.c:284 src/wx-console/wxbrestorepanel.cpp:350
-#: src/wx-console/wxbrestorepanel.cpp:1093
-#: src/wx-console/wxbrestorepanel.cpp:1874
+#: src/dird/ua_run.c:284
 msgid "Where"
 msgstr ""
 
@@ -4037,13 +3997,7 @@ msgstr ""
 msgid "File Relocation"
 msgstr ""
 
-#: src/dird/ua_run.c:286 src/wx-console/wxbrestorepanel.cpp:352
-#: src/wx-console/wxbrestorepanel.cpp:1101
-#: src/wx-console/wxbrestorepanel.cpp:1878
-#: src/wx-console/wxbrestorepanel.cpp:1879
-#: src/wx-console/wxbrestorepanel.cpp:1880
-#: src/wx-console/wxbrestorepanel.cpp:1881
-#: src/wx-console/wxbrestorepanel.cpp:1882
+#: src/dird/ua_run.c:286
 msgid "Replace"
 msgstr ""
 
@@ -5020,7 +4974,6 @@ msgstr ""
 
 #: src/dird/ua_status.c:763 src/filed/status.c:259 src/lib/util.c:188
 #: src/lib/util.c:255 src/stored/btape.c:1189 src/stored/status.c:524
-#: src/wx-console/wxbconfigpanel.cpp:201
 msgid "OK"
 msgstr ""
 
@@ -5789,22 +5742,20 @@ msgstr ""
 msgid "File: %s\n"
 msgstr ""
 
-#: src/console/authenticate.c:131 src/wx-console/authenticate.c:142
+#: src/console/authenticate.c:131
 msgid "TLS negotiation failed\n"
 msgstr ""
 
-#: src/console/authenticate.c:143 src/gnome2-console/authenticate.c:98
-#: src/tray-monitor/authenticate.c:97
+#: src/console/authenticate.c:143
 #, c-format
 msgid "Bad response to Hello command: ERR=%s\n"
 msgstr ""
 
-#: src/console/authenticate.c:150 src/gnome2-console/authenticate.c:108
-#: src/tray-monitor/authenticate.c:104 src/wx-console/authenticate.c:157
+#: src/console/authenticate.c:150
 msgid "Director rejected Hello command\n"
 msgstr ""
 
-#: src/console/authenticate.c:160 src/wx-console/authenticate.c:167
+#: src/console/authenticate.c:160
 msgid ""
 "Director authorization problem.\n"
 "Most likely the passwords do not agree.\n"
@@ -5895,19 +5846,17 @@ msgstr ""
 msgid "You must enter a number between 1 and %d\n"
 msgstr ""
 
-#: src/console/console.c:521 src/tray-monitor/tray-monitor.c:905
+#: src/console/console.c:521
 #, c-format
 msgid "Connecting to Director %s:%d\n"
 msgstr ""
 
-#: src/console/console.c:538 src/gnome2-console/console.c:526
-#: src/wx-console/console_thread.cpp:391
+#: src/console/console.c:538
 #, c-format
 msgid "Failed to initialize TLS context for Console \"%s\".\n"
 msgstr ""
 
-#: src/console/console.c:558 src/gnome2-console/console.c:548
-#: src/wx-console/console_thread.cpp:412
+#: src/console/console.c:558
 #, c-format
 msgid "Failed to initialize TLS context for Director \"%s\".\n"
 msgstr ""
@@ -5916,21 +5865,21 @@ msgstr ""
 msgid "Enter a period to cancel a command.\n"
 msgstr ""
 
-#: src/console/console.c:664 src/gnome2-console/console.c:160
+#: src/console/console.c:664
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Director \"%s\" in %s. At least one CA certificate store is required.\n"
 msgstr ""
 
-#: src/console/console.c:673 src/gnome2-console/console.c:169
+#: src/console/console.c:673
 #, c-format
 msgid ""
 "No Director resource defined in %s\n"
 "Without that I don't how to speak to the Director :-(\n"
 msgstr ""
 
-#: src/console/console.c:693 src/gnome2-console/console.c:189
+#: src/console/console.c:693
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -5973,19 +5922,17 @@ msgstr ""
 msgid "Autochanger error: ERR=%s\n"
 msgstr ""
 
-#: src/console/console_conf.c:138 src/gnome2-console/console_conf.c:134
-#: src/wx-console/console_conf.c:147
+#: src/console/console_conf.c:138
 #, c-format
 msgid "No record for %d %s\n"
 msgstr ""
 
-#: src/console/console_conf.c:147 src/wx-console/console_conf.c:156
+#: src/console/console_conf.c:147
 #, c-format
 msgid "Console: name=%s rcfile=%s histfile=%s\n"
 msgstr ""
 
-#: src/console/console_conf.c:151 src/gnome2-console/console_conf.c:143
-#: src/wx-console/console_conf.c:160
+#: src/console/console_conf.c:151
 #, c-format
 msgid "Director: name=%s address=%s DIRport=%d\n"
 msgstr ""
@@ -5993,12 +5940,8 @@ msgstr ""
 #: src/console/console_conf.c:155 src/console/console_conf.c:231
 #: src/console/console_conf.c:276 src/console/console_conf.c:303
 #: src/filed/filed_conf.c:319 src/filed/filed_conf.c:384
-#: src/filed/filed_conf.c:414 src/gnome2-console/console_conf.c:154
-#: src/gnome2-console/console_conf.c:232 src/gnome2-console/console_conf.c:280
-#: src/gnome2-console/console_conf.c:310 src/stored/stored_conf.c:528
+#: src/filed/filed_conf.c:414 src/stored/stored_conf.c:528
 #: src/stored/stored_conf.c:616 src/stored/stored_conf.c:651
-#: src/wx-console/console_conf.c:164 src/wx-console/console_conf.c:239
-#: src/wx-console/console_conf.c:284 src/wx-console/console_conf.c:311
 #, c-format
 msgid "Unknown resource type %d\n"
 msgstr ""
@@ -7289,345 +7232,6 @@ msgstr ""
 msgid "Cannot return to saved working directory: %s\n"
 msgstr ""
 
-#: src/gnome2-console/authenticate.c:87
-#, c-format
-msgid "%s: Director authorization problem.\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:88
-msgid "Director authorization problem.\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:90
-msgid ""
-"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for "
-"help.\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:100
-#, c-format
-msgid "%s: Bad response to Hello command: ERR=%s\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:102
-msgid "The Director is probably not running.\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:102
-#, c-format
-msgid ""
-"\n"
-"Version: %s (%s) %s %s %s\n"
-"\n"
-"Usage: bgnome-console [-s] [-c config_file] [-d debug_level] [config_file]\n"
-"       -c <file>   set configuration file to file\n"
-"       -dnn        set debug level to nn\n"
-"       -s          no signals\n"
-"       -t          test - read configuration and exit\n"
-"       -?          print this message.\n"
-"\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:234
-#, c-format
-msgid "Pthread cond init error = %s\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:379
-msgid " Not Connected"
-msgstr ""
-
-#: src/gnome2-console/console.c:500
-#, c-format
-msgid " Connecting to Director %s:%d"
-msgstr ""
-
-#: src/gnome2-console/console.c:501
-#, c-format
-msgid ""
-"Connecting to Director %s:%d\n"
-"\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:516 src/wx-console/console_thread.cpp:381
-#, c-format
-msgid "Passphrase for Console \"%s\" TLS private key: "
-msgstr ""
-
-#: src/gnome2-console/console.c:538 src/wx-console/console_thread.cpp:402
-#, c-format
-msgid "Passphrase for Director \"%s\" TLS private key: "
-msgstr ""
-
-#: src/gnome2-console/console.c:557 src/tray-monitor/tray-monitor.c:907
-#: src/wx-console/console_thread.cpp:420
-msgid "Director daemon"
-msgstr ""
-
-#: src/gnome2-console/console.c:569
-msgid " Initializing ..."
-msgstr ""
-
-#: src/gnome2-console/console.c:605
-msgid " Connected"
-msgstr ""
-
-#: src/gnome2-console/console.c:613
-msgid " Processing command ..."
-msgstr ""
-
-#: src/gnome2-console/console.c:648
-msgid " At prompt waiting for input ..."
-msgstr ""
-
-#: src/gnome2-console/console.c:768
-msgid " Ready"
-msgstr ""
-
-#: src/gnome2-console/console_conf.c:147
-#, c-format
-msgid "Console: name=%s\n"
-msgstr ""
-
-#: src/gnome2-console/console_conf.c:150 src/tray-monitor/tray_conf.c:195
-#, c-format
-msgid "ConsoleFont: name=%s font face=%s\n"
-msgstr ""
-
-#: src/gnome2-console/interface.c:202
-msgid "Bacula Console"
-msgstr ""
-
-#: src/gnome2-console/interface.c:235 src/wx-console/wxbmainframe.cpp:248
-#: src/wx-console/wxbmainframe.cpp:619
-msgid "Connect"
-msgstr ""
-
-#: src/gnome2-console/interface.c:238
-msgid "Connect to Director"
-msgstr ""
-
-#: src/gnome2-console/interface.c:242
-msgid "Run"
-msgstr ""
-
-#: src/gnome2-console/interface.c:245 src/gnome2-console/interface.c:682
-#: src/gnome2-console/interface.c:696
-msgid "Run a Job"
-msgstr ""
-
-#: src/gnome2-console/interface.c:249
-msgid "Dir Status"
-msgstr ""
-
-#: src/gnome2-console/interface.c:255 src/lib/util.c:293
-#: src/wx-console/wxbrestorepanel.cpp:404
-#: src/wx-console/wxbrestorepanel.cpp:1974
-msgid "Restore"
-msgstr ""
-
-#: src/gnome2-console/interface.c:261
-msgid "Label"
-msgstr ""
-
-#: src/gnome2-console/interface.c:267
-msgid "Msgs"
-msgstr ""
-
-#: src/gnome2-console/interface.c:270
-msgid "Display Messages"
-msgstr ""
-
-#: src/gnome2-console/interface.c:294
-msgid " Command: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:303
-msgid "Enter Commands Here"
-msgstr ""
-
-#: src/gnome2-console/interface.c:314
-msgid " Status: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:323 src/gnome2-console/interface.c:1709
-msgid "  "
-msgstr ""
-
-#: src/gnome2-console/interface.c:424
-msgid "About Bacula Console"
-msgstr ""
-
-#: src/gnome2-console/interface.c:439
-msgid "Bacula Console\n"
-msgstr ""
-
-#: src/gnome2-console/interface.c:448
-msgid "Copyright (c) 2000 - 2004, Kern Sibbald and John Walker"
-msgstr ""
-
-#: src/gnome2-console/interface.c:453
-msgid "Authors: Kern Sibbald and John Walker"
-msgstr ""
-
-#: src/gnome2-console/interface.c:458
-msgid "The Leading Open Source Backup Solution."
-msgstr ""
-
-#: src/gnome2-console/interface.c:523 src/gnome2-console/interface.c:540
-msgid "Select Director"
-msgstr ""
-
-#: src/gnome2-console/interface.c:570
-msgid "         "
-msgstr ""
-
-#: src/gnome2-console/interface.c:715 src/gnome2-console/interface.c:1631
-msgid "Job:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:736
-msgid "   Type:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:756 src/gnome2-console/interface.c:785
-#: src/gnome2-console/interface.c:1284 src/gnome2-console/interface.c:1680
-msgid " "
-msgstr ""
-
-#: src/gnome2-console/interface.c:765 src/gnome2-console/interface.c:1660
-#: src/wx-console/wxbrestorepanel.cpp:1886
-msgid "Client:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:795 src/gnome2-console/interface.c:1689
-msgid "FileSet: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:820 src/wx-console/wxbrestorepanel.cpp:1893
-msgid "Priority:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:836
-msgid "Level:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:857
-msgid "             "
-msgstr ""
-
-#: src/gnome2-console/interface.c:867 src/gnome2-console/interface.c:1433
-#: src/gnome2-console/interface.c:1718
-msgid "Pool:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:888 src/gnome2-console/interface.c:919
-#: src/gnome2-console/interface.c:949 src/gnome2-console/interface.c:969
-#: src/gnome2-console/interface.c:989 src/gnome2-console/interface.c:1009
-#: src/gnome2-console/interface.c:1014 src/gnome2-console/interface.c:1483
-#: src/gnome2-console/interface.c:1739 src/gnome2-console/interface.c:1769
-#: src/gnome2-console/interface.c:1788 src/gnome2-console/interface.c:1793
-msgid "   "
-msgstr ""
-
-#: src/gnome2-console/interface.c:898 src/gnome2-console/interface.c:1407
-#: src/gnome2-console/interface.c:1748 src/wx-console/wxbrestorepanel.cpp:1888
-msgid "Storage:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:929
-msgid "Messages:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:959
-msgid "Where: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:979 src/wx-console/wxbrestorepanel.cpp:1890
-msgid "When:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:999 src/wx-console/wxbrestorepanel.cpp:1871
-msgid "Bootstrap:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1194
-msgid "Restore File Selection"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1238
-msgid "Current dir:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1265
-msgid "Files Selected: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:1385 src/gnome2-console/interface.c:1396
-msgid "Label a Volume"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1458
-msgid "Volume Name:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1472
-msgid "Slot:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1598
-msgid "Restore Files Dialog"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1613
-msgid "Restore Files"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1778
-msgid "Before:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1824
-msgid "Select Files"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1907
-msgid "Progress"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149
-msgid "Mark"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149
-msgid "File"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149
-msgid "Mode"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:306
-msgid "User"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:310
-msgid "Group"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:294
-msgid "Size"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:298
-msgid "Date"
-msgstr ""
-
-#: src/gnome2-console/support.c:60 src/gnome2-console/support.c:85
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
 #: src/lib/address_conf.c:63
 #, c-format
 msgid "Only ipv4 and ipv6 are supported (%d)\n"
@@ -8240,20 +7844,6 @@ msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Director.\n"
 msgstr ""
 
-#: src/lib/lex.c:93 src/wx-console/console_thread.cpp:208
-#, c-format
-msgid "Problem probably begins at line %d.\n"
-msgstr ""
-
-#: src/lib/lex.c:98 src/wx-console/console_thread.cpp:213
-#, c-format
-msgid ""
-"Config error: %s\n"
-"            : line %d, col %d of file %s\n"
-"%s\n"
-"%s"
-msgstr ""
-
 #: src/lib/lex.c:102
 #, c-format
 msgid "Config error: %s\n"
@@ -9229,7 +8819,7 @@ msgstr ""
 msgid "Copy"
 msgstr ""
 
-#: src/lib/util.c:305 src/wx-console/wxbmainframe.cpp:276
+#: src/lib/util.c:305
 msgid "Console"
 msgstr ""
 
@@ -14540,460 +14130,78 @@ msgstr ""
 msgid "Skip: File system change prohibited. Directory not entered. %s\n"
 msgstr ""
 
-#: src/tray-monitor/authenticate.c:88
-msgid ""
-"Director authorization problem.\n"
-"Most likely the passwords do not agree.\n"
-"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for "
-"help.\n"
-msgstr ""
-
-#: src/tray-monitor/authenticate.c:138
-msgid ""
-"Director and Storage daemon passwords or names not the same.\n"
-"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for "
-"help.\n"
-msgstr ""
-
-#: src/tray-monitor/authenticate.c:145
+#: src/baconfig.h:72
 #, c-format
-msgid "bdird<stored: bad response to Hello command: ERR=%s\n"
+msgid "Failed ASSERT: %s\n"
 msgstr ""
 
-#: src/tray-monitor/authenticate.c:178
-#, c-format
-msgid "Error sending Hello to File daemon. ERR=%s\n"
+#: src/baconfig.h:79
+msgid "*None*"
 msgstr ""
 
-#: src/tray-monitor/authenticate.c:184
-msgid ""
-"Director and File daemon passwords or names not the same.\n"
-"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for "
-"help.\n"
+#: src/win32/dird/winmain.cpp:193 src/win32/dird/winmain.cpp:200
+#: src/win32/filed/winmain.cpp:224 src/win32/filed/winmain.cpp:231
+#: src/win32/stored/baculasd/winmain.cpp:225
+#: src/win32/stored/baculasd/winmain.cpp:232
+msgid "Bacula Usage"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:113
-#, c-format
-msgid ""
-"Written by Nicolas Boichat (2004)\n"
-"\n"
-"Version: %s (%s) %s %s %s\n"
-"\n"
-"Usage: tray-monitor [-c config_file] [-d debug_level]\n"
-"       -c <file>     set configuration file to file\n"
-"       -dnn          set debug level to nn\n"
-"       -t            test - read configuration and exit\n"
-"       -?            print this message.\n"
-"\n"
+#: src/win32/dird/winmain.cpp:197 src/win32/filed/winmain.cpp:228
+#: src/win32/stored/baculasd/winmain.cpp:229
+msgid "Bad Command Line Options"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:262
-#, c-format
-msgid ""
-"Error: %d Monitor resources defined in %s. You must define one and only one "
-"Monitor resource.\n"
+#: src/win32/dird/winservice.cpp:119 src/win32/filed/winservice.cpp:238
+#: src/win32/stored/baculasd/winservice.cpp:169
+msgid "StartServiceCtrlDispatcher failed."
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:293
-#, c-format
-msgid ""
-"No Client, Storage or Director resource defined in %s\n"
-"Without that I don't how to get status from the File, Storage or Director "
-"Daemon :-(\n"
+#: src/win32/dird/winservice.cpp:135 src/win32/filed/winservice.cpp:256
+#: src/win32/stored/baculasd/winservice.cpp:185
+msgid "RegisterServiceCtlHandler failed"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:315
-#, c-format
-msgid ""
-"Invalid refresh interval defined in %s\n"
-"This value must be greater or equal to 1 second and less or equal to 10 "
-"minutes (read value: %d).\n"
+#: src/win32/dird/winservice.cpp:136 src/win32/filed/winservice.cpp:257
+#: src/win32/stored/baculasd/winservice.cpp:186
+msgid "Contact Register Service Handler failure"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:330
-msgid "Open status window..."
+#: src/win32/dird/winservice.cpp:152 src/win32/filed/winservice.cpp:273
+#: src/win32/stored/baculasd/winservice.cpp:202
+msgid "ReportStatus STOPPED failed 1"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:336
-msgid "Exit"
+#: src/win32/dird/winservice.cpp:175 src/win32/filed/winservice.cpp:296
+#: src/win32/stored/baculasd/winservice.cpp:225
+msgid "Report Service failure"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:348
-msgid "Bacula tray monitor"
+#: src/win32/dird/winservice.cpp:211
+msgid "Unable to install Bacula Director service"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:373
-msgid " (DIR)"
+#: src/win32/dird/winservice.cpp:219 src/win32/filed/winservice.cpp:340
+#: src/win32/stored/baculasd/winservice.cpp:269
+msgid "Service command length too long"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:377
-msgid " (FD)"
+#: src/win32/dird/winservice.cpp:220 src/win32/filed/winservice.cpp:341
+#: src/win32/stored/baculasd/winservice.cpp:270
+msgid "Service command length too long. Service not registered."
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:381
-msgid " (SD)"
+#: src/win32/dird/winservice.cpp:233
+msgid ""
+"The Service Control Manager could not be contacted - the Bacula Director "
+"service was not installed"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:394
-msgid "Unknown status."
+#: src/win32/dird/winservice.cpp:258
+msgid "The Bacula Director service could not be installed"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:464
-msgid "Refresh interval in seconds: "
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:472
-msgid "Refresh now"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:476
-msgid "About"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:480
-msgid "Close"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:500
-#, c-format
-msgid "Disconnecting from Director %s:%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:503
-#, c-format
-msgid "Disconnecting from Client %s:%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:506
-#, c-format
-msgid "Disconnecting from Storage %s:%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:543 src/tray-monitor/tray-monitor.c:554
-msgid "Bacula Tray Monitor"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:545 src/tray-monitor/tray-monitor.c:556
-msgid "Written by Nicolas Boichat\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:546 src/tray-monitor/tray-monitor.c:557
-msgid "Version"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:625
-#, c-format
-msgid "Error, currentitem is not a Client or a Storage..\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:699
-#, c-format
-msgid ""
-"Current job: %s\n"
-"Last job: %s"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:711
-#, c-format
-msgid " (%d errors)"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:714
-#, c-format
-msgid " (%d error)"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:752
-msgid "No current job."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:755
-msgid "No last job."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:763
-msgid "Job status: Created"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:768
-msgid "Job status: Running"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:772
-msgid "Job status: Blocked"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:777
-msgid "Job status: Terminated"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:782
-msgid "Job status: Terminated in error"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:788
-msgid "Job status: Error"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:792
-msgid "Job status: Fatal error"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:797
-msgid "Job status: Verify differences"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:802
-msgid "Job status: Canceled"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:807
-msgid "Job status: Waiting on File daemon"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:812
-msgid "Job status: Waiting on the Storage daemon"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:817
-msgid "Job status: Waiting for new media"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:822
-msgid "Job status: Waiting for Mount"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:827
-msgid "Job status: Waiting for storage resource"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:832
-msgid "Job status: Waiting for job resource"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:837
-msgid "Job status: Waiting for Client resource"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:842
-msgid "Job status: Waiting for maximum jobs"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:847
-msgid "Job status: Waiting for start time"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:852
-msgid "Job status: Waiting for higher priority jobs to finish"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:857
-#, c-format
-msgid "Unknown job status %c."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:858
-#, c-format
-msgid "Job status: Unknown(%c)"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:865
-#, c-format
-msgid "Bad scan : '%s' %d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:906
-#, c-format
-msgid "Connecting to Director %s:%d"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:912
-#, c-format
-msgid "Connecting to Client %s:%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:913
-#, c-format
-msgid "Connecting to Client %s:%d"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:919
-#, c-format
-msgid "Connecting to Storage %s:%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:920
-#, c-format
-msgid "Connecting to Storage %s:%d"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:925 src/tray-monitor/tray-monitor.c:963
-#, c-format
-msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:931
-msgid "Cannot connect to daemon.\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:932
-msgid "Cannot connect to daemon."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:944
-#, c-format
-msgid "Authentication error : %s"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:951
-msgid "Opened connection with Director daemon.\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:952
-msgid "Opened connection with Director daemon."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:955
-msgid "Opened connection with File daemon.\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:956
-msgid "Opened connection with File daemon."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:959
-msgid "Opened connection with Storage daemon.\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:960
-msgid "Opened connection with Storage daemon."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:997
-msgid "<< Error: BNET_PROMPT signal received. >>\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:1002 src/wx-console/console_thread.cpp:486
-msgid "<< Heartbeat signal received, answered. >>\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:1006
-#, c-format
-msgid "<< Unexpected signal received : %s >>\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:1011
-msgid "<ERROR>\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:1015
-msgid "Error : BNET_HARDEOF or BNET_ERROR"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:1021
-msgid "<STOP>\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:1025
-msgid "Error : Connection closed."
-msgstr ""
-
-#: src/tray-monitor/tray_conf.c:177
-#, c-format
-msgid "Monitor: name=%s FDtimeout=%s SDtimeout=%s\n"
-msgstr ""
-
-#: src/tray-monitor/tray_conf.c:183
-#, c-format
-msgid "Director: name=%s address=%s FDport=%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray_conf.c:187
-#, c-format
-msgid "Client: name=%s address=%s FDport=%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray_conf.c:191
-#, c-format
-msgid "Storage: name=%s address=%s SDport=%d\n"
-msgstr ""
-
-#: src/wx-console/authenticate.c:150
-msgid "Bad response to Hello command: ERR="
-msgstr ""
-
-#: src/baconfig.h:72
-#, c-format
-msgid "Failed ASSERT: %s\n"
-msgstr ""
-
-#: src/baconfig.h:79
-msgid "*None*"
-msgstr ""
-
-#: src/win32/dird/winmain.cpp:193 src/win32/dird/winmain.cpp:200
-#: src/win32/filed/winmain.cpp:224 src/win32/filed/winmain.cpp:231
-#: src/win32/stored/baculasd/winmain.cpp:225
-#: src/win32/stored/baculasd/winmain.cpp:232
-msgid "Bacula Usage"
-msgstr ""
-
-#: src/win32/dird/winmain.cpp:197 src/win32/filed/winmain.cpp:228
-#: src/win32/stored/baculasd/winmain.cpp:229
-msgid "Bad Command Line Options"
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:119 src/win32/filed/winservice.cpp:238
-#: src/win32/stored/baculasd/winservice.cpp:169
-msgid "StartServiceCtrlDispatcher failed."
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:135 src/win32/filed/winservice.cpp:256
-#: src/win32/stored/baculasd/winservice.cpp:185
-msgid "RegisterServiceCtlHandler failed"
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:136 src/win32/filed/winservice.cpp:257
-#: src/win32/stored/baculasd/winservice.cpp:186
-msgid "Contact Register Service Handler failure"
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:152 src/win32/filed/winservice.cpp:273
-#: src/win32/stored/baculasd/winservice.cpp:202
-msgid "ReportStatus STOPPED failed 1"
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:175 src/win32/filed/winservice.cpp:296
-#: src/win32/stored/baculasd/winservice.cpp:225
-msgid "Report Service failure"
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:211
-msgid "Unable to install Bacula Director service"
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:219 src/win32/filed/winservice.cpp:340
-#: src/win32/stored/baculasd/winservice.cpp:269
-msgid "Service command length too long"
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:220 src/win32/filed/winservice.cpp:341
-#: src/win32/stored/baculasd/winservice.cpp:270
-msgid "Service command length too long. Service not registered."
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:233
-msgid ""
-"The Service Control Manager could not be contacted - the Bacula Director "
-"service was not installed"
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:258
-msgid "The Bacula Director service could not be installed"
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:264
-msgid "Provides director services. Bacula -- the network backup solution."
+#: src/win32/dird/winservice.cpp:264
+msgid "Provides director services. Bacula -- the network backup solution."
 msgstr ""
 
 #: src/win32/dird/winservice.cpp:272
@@ -15221,710 +14429,3 @@ msgstr ""
 msgid ""
 "The SCM could not be contacted - the Bacula Storage service was not removed"
 msgstr ""
-
-#: src/wx-console/console_thread.cpp:121
-#, c-format
-msgid ""
-"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
-"Director \"%s\" in config file.\n"
-"At least one CA certificate store is required.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:128
-msgid ""
-"No Director resource defined in config file.\n"
-"Without that I don't how to speak to the Director :-(\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:147
-#, c-format
-msgid ""
-"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
-"Console \"%s\" in config file.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:169
-msgid "Error while initializing windows sockets...\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:185
-msgid "Error while cleaning up windows sockets...\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:224
-msgid "Error while initializing library."
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:248
-msgid "Cryptographic library initialization failed.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:252
-msgid "Please correct configuration file.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:294
-msgid "Error : Library not initialized\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:305
-msgid "Error : No configuration file loaded\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:315
-msgid "Connecting...\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:331
-msgid "Error : No director defined in config file.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:343
-msgid "Multiple directors found in your config file.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:352
-#, c-format
-msgid "Please choose a director (1-%d): "
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:424
-msgid "Failed to connect to the director\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:434
-msgid "Connected\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:491
-msgid "<< Unexpected signal received : "
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:511
-msgid "Connection terminated\n"
-msgstr ""
-
-#: src/wx-console/main.cpp:119
-msgid "Bacula bwx-console"
-msgstr ""
-
-#: src/wx-console/main.cpp:124 src/wx-console/wxbmainframe.cpp:267
-#, c-format
-msgid "Welcome to bacula bwx-console %s (%s)!\n"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:65
-msgid "Config file editor"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:75
-msgid "# Bacula bwx-console Configuration File\n"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:111
-msgid "Save and close"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:112
-msgid "Close without saving"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:139
-#, c-format
-msgid "Unable to write to %s\n"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:140
-msgid "Error while saving"
-msgstr ""
-
-#: src/wx-console/wxbconfigpanel.cpp:205
-msgid "Apply"
-msgstr ""
-
-#: src/wx-console/wxbhistorytextctrl.cpp:82
-#: src/wx-console/wxbhistorytextctrl.cpp:153
-#: src/wx-console/wxbmainframe.cpp:291
-msgid "Type your command below:"
-msgstr ""
-
-#: src/wx-console/wxbhistorytextctrl.cpp:117
-msgid "Unknown command."
-msgstr ""
-
-#: src/wx-console/wxbhistorytextctrl.cpp:126
-msgid "Possible completions: "
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:246
-msgid "&About...\tF1"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:246
-msgid "Show about dialog"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:248 src/wx-console/wxbmainframe.cpp:620
-msgid "Connect to the director"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:249
-msgid "Disconnect"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:249
-msgid "Disconnect of the director"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:251
-msgid "Change of configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:251
-msgid "Change your default configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:252
-msgid "Edit your configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:254
-msgid "E&xit\tAlt-X"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:254
-msgid "Quit this program"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:258
-msgid "&File"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:259
-msgid "&Help"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:283
-msgid ""
-"Warning : Unicode is disabled because you are using wxWidgets for GTK+ 1.2.\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:287
-msgid ""
-"Warning : There is a problem with wxWidgets for GTK+ 2.0 without Unicode "
-"support when handling non-ASCII filenames: Every non-ASCII character in such "
-"filenames will be replaced by an interrogation mark.\n"
-"If this behaviour disturbs you, please build bwx-console against a Unicode "
-"version of wxWidgets for GTK+ 2.0.\n"
-"---\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:298
-msgid "Send"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:375 src/wx-console/wxbmainframe.cpp:387
-msgid "Error while parsing command line arguments, using defaults.\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:376 src/wx-console/wxbmainframe.cpp:388
-msgid "Usage: bwx-console [-c configfile] [-w tmp]\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:417
-#, c-format
-msgid ""
-"It seems that it is the first time you run bwx-console.\n"
-"This file (%s) has been choosen as default configuration file.\n"
-"Do you want to edit it? (if you click No you will have to select another "
-"file)"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:419
-msgid "First run"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:436
-#, c-format
-msgid ""
-"Unable to read %s\n"
-"Error: %s\n"
-"Do you want to choose another one? (Press no to edit this file)"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:438
-msgid "Unable to read configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:450
-msgid "Please choose a configuration file to use"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:463
-msgid "This configuration file has been successfully read, use it as default?"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:464
-msgid "Configuration file read successfully"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:474
-#, c-format
-msgid "Using this configuration file: %s\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:479
-msgid "Connecting to the director..."
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:494
-msgid "Failed to unregister a data parser !"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:502
-msgid "Quitting.\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:517
-msgid ""
-"Welcome to Bacula bwx-console.\n"
-"Written by Nicolas Boichat <nicolas@boichat.ch>\n"
-"Copyright (C), 2005-2007 Free Software Foundation Europe, e.V.\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:521
-msgid "About Bacula bwx-console"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:527
-msgid "Please choose your default configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:531
-msgid "Use this configuration file as default?"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:532
-msgid "Configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:603
-msgid "Console thread terminated."
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:611
-msgid "Connection to the director lost. Quit program?"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:612
-msgid "Connection lost"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:628
-msgid "Connected to the director."
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:651
-msgid "Reconnect"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:652
-msgid "Reconnect to the director"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:666
-msgid "Disconnected of the director."
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:685 src/wx-console/wxbrestorepanel.cpp:710
-msgid "Unexpected question has been received.\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:708 src/wx-console/wxbmainframe.cpp:725
-msgid "bwx-console: unexpected director's question."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:234
-#: src/wx-console/wxbrestorepanel.cpp:1920
-#: src/wx-console/wxbrestorepanel.cpp:1949
-msgid "Enter restore mode"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:237
-msgid "Cancel restore"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:263
-#: src/wx-console/wxbrestorepanel.cpp:317
-msgid "Add"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:265
-#: src/wx-console/wxbrestorepanel.cpp:319
-msgid "Remove"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:267
-#: src/wx-console/wxbrestorepanel.cpp:321
-msgid "Refresh"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:286
-msgid "M"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:290
-msgid "Filename"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:302
-msgid "Perm."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:335
-#: src/wx-console/wxbrestorepanel.cpp:348
-#: src/wx-console/wxbrestorepanel.cpp:503
-#: src/wx-console/wxbrestorepanel.cpp:513
-#: src/wx-console/wxbrestorepanel.cpp:516
-#: src/wx-console/wxbrestorepanel.cpp:1784
-#: src/wx-console/wxbrestorepanel.cpp:1870
-msgid "Job Name"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:337
-#: src/wx-console/wxbrestorepanel.cpp:353
-#: src/wx-console/wxbrestorepanel.cpp:455
-#: src/wx-console/wxbrestorepanel.cpp:456
-#: src/wx-console/wxbrestorepanel.cpp:466
-#: src/wx-console/wxbrestorepanel.cpp:467
-#: src/wx-console/wxbrestorepanel.cpp:1139
-#: src/wx-console/wxbrestorepanel.cpp:1212
-#: src/wx-console/wxbrestorepanel.cpp:1822
-#: src/wx-console/wxbrestorepanel.cpp:1824
-#: src/wx-console/wxbrestorepanel.cpp:1885
-msgid "Fileset"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:340
-#: src/wx-console/wxbrestorepanel.cpp:1206
-#: src/wx-console/wxbrestorepanel.cpp:1222
-#: src/wx-console/wxbrestorepanel.cpp:1224
-#: src/wx-console/wxbrestorepanel.cpp:1232
-#: src/wx-console/wxbrestorepanel.cpp:1234
-#: src/wx-console/wxbrestorepanel.cpp:1253
-#: src/wx-console/wxbrestorepanel.cpp:1260
-#: src/wx-console/wxbrestorepanel.cpp:1812
-#: src/wx-console/wxbrestorepanel.cpp:1823
-#: src/wx-console/wxbrestorepanel.cpp:1944
-msgid "Before"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:342
-msgid "Please configure parameters concerning files to restore :"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-#: src/wx-console/wxbrestorepanel.cpp:1878
-msgid "always"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-msgid "if newer"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-msgid "if older"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-#: src/wx-console/wxbrestorepanel.cpp:1881
-msgid "never"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:359
-msgid "Please configure parameters concerning files restoration :"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:427
-msgid "Getting parameters list."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:435
-msgid "Error : no clients returned by the director."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:459
-msgid "Error : no filesets returned by the director."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:483
-msgid "Error : no storage returned by the director."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:506
-#: src/wx-console/wxbrestorepanel.cpp:530
-msgid "Error : no jobs returned by the director."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:516
-msgid "RestoreFiles"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:551
-msgid "Please configure your restore parameters."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:562
-msgid "Building restore tree..."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:605
-msgid "Error while starting restore: "
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:695
-msgid ""
-"Right click on a file or on a directory, or double-click on its mark to add "
-"it to the restore list."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:732
-#: src/wx-console/wxbrestorepanel.cpp:754
-msgid "bwx-console: unexpected restore question."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:765
-msgid " files selected to be restored."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:770
-msgid " file selected to be restored."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:777
-#, c-format
-msgid "Please configure your restore (%ld files selected to be restored)..."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:787
-msgid "Restore failed : no file selected.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:788
-msgid "Restore failed : no file selected."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:798
-msgid "Restoring, please wait..."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:811
-msgid "Job queued. JobId="
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:813
-msgid "Restore queued, jobid="
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:817
-msgid "Job failed."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:818
-msgid "Restore failed, please look at messages.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:819
-msgid "Restore failed, please look at messages in console."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:825
-#: src/wx-console/wxbrestorepanel.cpp:826
-msgid "Failed to retrieve jobid.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:852
-msgid ""
-"Restore is scheduled in more than two minutes, bwx-console will not wait for "
-"its completion.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:853
-msgid ""
-"Restore is scheduled in more than two minutes, bwx-console will not wait for "
-"its completion."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:879
-msgid "Restore job created, but not yet running."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:884
-#, c-format
-msgid "Restore job running, please wait (%ld of %ld files restored)..."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:888
-msgid "Restore job terminated successfully."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:889
-msgid "Restore job terminated successfully.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:894
-msgid "Restore job terminated in error, see messages in console."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:895
-msgid "Restore job terminated in error, see messages.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:900
-msgid "Restore job reported a non-fatal error."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:904
-msgid "Restore job reported a fatal error."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:909
-msgid "Restore job cancelled by user."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:910
-msgid "Restore job cancelled by user.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:915
-msgid "Restore job is waiting on File daemon."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:919
-msgid "Restore job is waiting for new media."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:923
-msgid "Restore job is waiting for storage resource."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:927
-msgid "Restore job is waiting for job resource."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:931
-msgid "Restore job is waiting for Client resource."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:935
-msgid "Restore job is waiting for maximum jobs."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:939
-msgid "Restore job is waiting for start time."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:943
-msgid "Restore job is waiting for higher priority jobs to finish."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:992
-msgid ""
-"The restore job has not been started within one minute, bwx-console will not "
-"wait for its completion anymore.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:993
-msgid ""
-"The restore job has not been started within one minute, bwx-console will not "
-"wait for its completion anymore."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1003
-msgid "Restore done successfully.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1004
-msgid "Restore done successfully."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1075
-msgid "Applying restore configuration changes..."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1126
-msgid "Failed to find the selected client."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1141
-msgid "Failed to find the selected fileset."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1156
-msgid "Failed to find the selected storage."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1173
-#: src/wx-console/wxbrestorepanel.cpp:1859
-msgid "Run Restore job"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1189
-msgid "Restore configuration changes were applied."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1198
-msgid "Restore cancelled.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1199
-msgid "Restore cancelled."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1221
-msgid "No results to list."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1223
-msgid "No backup found for this client."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1230
-msgid "ERROR"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1231
-msgid "Query failed"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1233
-msgid "Cannot get previous backups list, see console."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1869
-msgid "JobName:"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1873
-msgid "Where:"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1876
-msgid "Replace:"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1879
-msgid "ifnewer"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1880
-msgid "ifolder"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1884
-msgid "FileSet:"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:2001
-msgid "Restoring..."
-msgstr ""
diff --git a/bacula/po/fr.po b/bacula/po/fr.po
index 74e1683..042d681 100644
--- a/bacula/po/fr.po
+++ b/bacula/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Bacula 5.2\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2014-03-23 22:51+0100\n"
+"POT-Creation-Date: 2014-03-30 20:55+0200\n"
 "PO-Revision-Date: 2009-10-18 14:04+0000\n"
 "Last-Translator: Eric Bollengier <eric@eb.homelinux.org>\n"
 "Language-Team: French <bacula-devel-fr@lists.sourceforge.net>\n"
@@ -62,7 +62,7 @@ msgstr ""
 "Vous trouverez de l'aide sur\n"
 "http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors\n"
 
-#: src/console/console_conf.c:128 src/qt-console/bat_conf.cpp:129
+#: src/console/console_conf.c:128 src/qt-console/bat_conf.cpp:130
 #, c-format
 msgid "No record for %d %s\n"
 msgstr ""
@@ -72,33 +72,33 @@ msgstr ""
 msgid "Console: name=%s rcfile=%s histfile=%s\n"
 msgstr ""
 
-#: src/console/console_conf.c:141 src/qt-console/bat_conf.cpp:138
+#: src/console/console_conf.c:141 src/qt-console/bat_conf.cpp:139
 #, c-format
 msgid "Director: name=%s address=%s DIRport=%d\n"
 msgstr ""
 
-#: src/console/console_conf.c:145 src/console/console_conf.c:221
-#: src/console/console_conf.c:266 src/console/console_conf.c:293
+#: src/console/console_conf.c:145 src/console/console_conf.c:224
+#: src/console/console_conf.c:269 src/console/console_conf.c:296
 #: src/stored/stored_conf.c:538 src/stored/stored_conf.c:628
 #: src/stored/stored_conf.c:663 src/filed/filed_conf.c:411
 #: src/filed/filed_conf.c:476 src/filed/filed_conf.c:506
-#: src/qt-console/bat_conf.cpp:149 src/qt-console/bat_conf.cpp:227
-#: src/qt-console/bat_conf.cpp:275 src/qt-console/bat_conf.cpp:305
+#: src/qt-console/bat_conf.cpp:150 src/qt-console/bat_conf.cpp:231
+#: src/qt-console/bat_conf.cpp:279 src/qt-console/bat_conf.cpp:309
 #, c-format
 msgid "Unknown resource type %d\n"
 msgstr ""
 
-#: src/console/console_conf.c:247 src/dird/dird_conf.c:1425
+#: src/console/console_conf.c:250 src/dird/dird_conf.c:1425
 #: src/dird/dird_conf.c:1440 src/filed/filed_conf.c:439
 #: src/qt-console/tray-monitor/tray_conf.cpp:276
-#: src/qt-console/bat_conf.cpp:253
+#: src/qt-console/bat_conf.cpp:257
 #, c-format
 msgid "%s item is required in %s resource, but not found.\n"
 msgstr ""
 
-#: src/console/console_conf.c:310 src/dird/dird_conf.c:1664
+#: src/console/console_conf.c:313 src/dird/dird_conf.c:1664
 #: src/filed/filed_conf.c:524 src/qt-console/tray-monitor/tray_conf.cpp:360
-#: src/qt-console/bat_conf.cpp:322
+#: src/qt-console/bat_conf.cpp:326
 #, c-format
 msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
 msgstr ""
@@ -206,38 +206,38 @@ msgstr "Vous devez saisir un nombre entre 1 et %d\n"
 msgid "You must enter a number between 1 and %d\n"
 msgstr "Vous devez saisir un nombre entre 1 et %d\n"
 
-#: src/console/console.c:1095 src/stored/stored.c:215 src/dird/dird.c:267
+#: src/console/console.c:1101 src/stored/stored.c:215 src/dird/dird.c:267
 #: src/filed/filed.c:204 src/qt-console/main.cpp:154
 msgid "Cryptography library initialization failed.\n"
 msgstr ""
 
-#: src/console/console.c:1099 src/stored/stored.c:219 src/dird/dird.c:271
+#: src/console/console.c:1105 src/stored/stored.c:219 src/dird/dird.c:271
 #: src/dird/dird.c:299 src/dird/dird.c:517 src/dird/dird.c:520
 #: src/filed/filed.c:209 src/qt-console/main.cpp:158
 #, c-format
 msgid "Please correct configuration file: %s\n"
 msgstr "Merci de corriger le fichier de configuration : %s\n"
 
-#: src/console/console.c:1129
+#: src/console/console.c:1136
 #, c-format
 msgid "Connecting to Director %s:%d\n"
 msgstr "Connexion au Director %s:%d\n"
 
-#: src/console/console.c:1146 src/qt-console/bcomm/dircomm.cpp:118
+#: src/console/console.c:1153 src/qt-console/bcomm/dircomm.cpp:150
 #, c-format
 msgid "Failed to initialize TLS context for Console \"%s\".\n"
 msgstr "Impossible d'initialiser le contexte TLS pour la Console \"%s\".\n"
 
-#: src/console/console.c:1166 src/qt-console/bcomm/dircomm.cpp:141
+#: src/console/console.c:1173 src/qt-console/bcomm/dircomm.cpp:173
 #, c-format
 msgid "Failed to initialize TLS context for Director \"%s\".\n"
 msgstr "Impossible d'initialiser le contexte TLS pour le Director \"%s\".\n"
 
-#: src/console/console.c:1198
+#: src/console/console.c:1205
 msgid "Enter a period to cancel a command.\n"
 msgstr "Tapez un point (.) pour annuler une commande.\n"
 
-#: src/console/console.c:1284 src/console/console.c:1314
+#: src/console/console.c:1291 src/console/console.c:1321
 #: src/stored/stored.c:342 src/dird/dird.c:607 src/dird/dird.c:813
 #: src/dird/dird.c:868 src/dird/dird.c:907 src/filed/filed.c:366
 #: src/filed/filed.c:566 src/qt-console/main.cpp:213
@@ -245,14 +245,14 @@ msgstr "Tapez un point (.) pour annuler une commande.\n"
 msgid "TLS required but not configured in Bacula.\n"
 msgstr ""
 
-#: src/console/console.c:1292 src/qt-console/main.cpp:221
+#: src/console/console.c:1299 src/qt-console/main.cpp:221
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Director \"%s\" in %s. At least one CA certificate store is required.\n"
 msgstr ""
 
-#: src/console/console.c:1301 src/qt-console/main.cpp:230
+#: src/console/console.c:1308 src/qt-console/main.cpp:230
 #, c-format
 msgid ""
 "No Director resource defined in %s\n"
@@ -261,47 +261,47 @@ msgstr ""
 "Pas de director défini pour %s\n"
 "Sans cette définition, il n'est pas possible de se connecter à celui-ci.\n"
 
-#: src/console/console.c:1321 src/qt-console/main.cpp:251
+#: src/console/console.c:1328 src/qt-console/main.cpp:251
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Console \"%s\" in %s.\n"
 msgstr ""
 
-#: src/console/console.c:1347
+#: src/console/console.c:1354
 msgid "Too many arguments on input command.\n"
 msgstr "Trop d'arguments sur la commande.\n"
 
-#: src/console/console.c:1351
+#: src/console/console.c:1358
 msgid "First argument to input command must be a filename.\n"
 msgstr "Le premier argument de la commande doit être un fichier.\n"
 
-#: src/console/console.c:1357
+#: src/console/console.c:1364
 #, c-format
 msgid "Cannot open file %s for input. ERR=%s\n"
 msgstr "Impossible d'ouvrir le fichier %s pour lecture. ERR=%s\n"
 
-#: src/console/console.c:1389
+#: src/console/console.c:1396
 msgid "Too many arguments on output/tee command.\n"
 msgstr ""
 
-#: src/console/console.c:1406
+#: src/console/console.c:1413
 #, c-format
 msgid "Cannot open file %s for output. ERR=%s\n"
 msgstr "Impossible d'ouvrir le fichier %s pour la sortie. ERR=%s\n"
 
-#: src/console/console.c:1425
+#: src/console/console.c:1432
 msgid "Too many arguments. Enclose command in double quotes.\n"
 msgstr ""
 "Trop d'arguments sur la commande. Essayez d'utiliser des « \" » autour des "
 "commandes\n"
 
-#: src/console/console.c:1434
+#: src/console/console.c:1441
 #, fuzzy, c-format
 msgid "Cannot popen(\"%s\", \"r\"): ERR=%s\n"
 msgstr "Impossible d'ouvrir le fichier %s : ERR=%s\n"
 
-#: src/console/console.c:1446 src/stored/autochanger.c:665
+#: src/console/console.c:1453 src/stored/autochanger.c:665
 #, c-format
 msgid "Autochanger error: ERR=%s\n"
 msgstr "Erreur sur l'autochangeur : ERR=%s\n"
@@ -4323,7 +4323,7 @@ msgid "Bad storage command: %s"
 msgstr ""
 
 #: src/stored/dircmd.c:377 src/dird/msgchan.c:121 src/filed/job.c:1880
-#: src/qt-console/tray-monitor/tray-monitor.cpp:363
+#: src/qt-console/tray-monitor/tray-monitor.cpp:372
 msgid "Storage daemon"
 msgstr ""
 
@@ -5231,17 +5231,17 @@ msgstr "Impossible de trouver le prochain volume pour le Job %s.\n"
 msgid "Cannot free Volume \"%s\", because it is reserved by someone else.\n"
 msgstr "Impossible de pruner le Volume \"%s\" car il est archivé.\n"
 
-#: src/stored/vol_mgr.c:512
+#: src/stored/vol_mgr.c:514
 #, c-format
 msgid "Volume %s is busy swapping from %s to %s\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:515
+#: src/stored/vol_mgr.c:517
 #, fuzzy, c-format
 msgid "Volume %s is busy swapping.\n"
 msgstr "Le device %s est occupé en lecture.\n"
 
-#: src/stored/vol_mgr.c:519
+#: src/stored/vol_mgr.c:521
 #, fuzzy, c-format
 msgid "%s device %s is busy.\n"
 msgstr "Le device %s est occupé en lecture.\n"
@@ -6893,17 +6893,17 @@ msgstr "Impossible d'initialiser la queue cliente : ERR=%s\n"
 msgid "NULL jcr.\n"
 msgstr "NULL jcr.\n"
 
-#: src/lib/jcr.c:496
+#: src/lib/jcr.c:495
 #, c-format
 msgid "JCR use_count=%d JobId=%d\n"
 msgstr "JCR use_count=%d JobId=%d\n"
 
-#: src/lib/jcr.c:601
+#: src/lib/jcr.c:600
 #, fuzzy, c-format
 msgid "pthread_setspecific failed: ERR=%s\n"
 msgstr "Erreur sur l'ouverture du périphérique. ERR=%s\n"
 
-#: src/lib/jcr.c:1082
+#: src/lib/jcr.c:1081
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Storage "
@@ -6912,7 +6912,7 @@ msgstr ""
 "Le watchdog a envoyé un signal après %d secs au thread bloqué en écoute du "
 "SD.\n"
 
-#: src/lib/jcr.c:1094
+#: src/lib/jcr.c:1093
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading File daemon.\n"
@@ -6920,7 +6920,7 @@ msgstr ""
 "Le watchdog a envoyé un signal après %d secs au thread bloqué en écoute du "
 "FD.\n"
 
-#: src/lib/jcr.c:1106
+#: src/lib/jcr.c:1105
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Director.\n"
@@ -6955,101 +6955,101 @@ msgstr "Erreur de config : %s\n"
 msgid "Close of NULL file\n"
 msgstr ""
 
-#: src/lib/lex.c:212
+#: src/lib/lex.c:215
 msgid ""
 "get_char: called after EOF. You may have a open double quote without the "
 "closing double quote.\n"
 msgstr ""
 
-#: src/lib/lex.c:254
+#: src/lib/lex.c:257
 #, c-format
 msgid "Config token too long, file: %s, line %d, begins at line %d\n"
 msgstr "Config token trop long, fichier : %s, ligne %d, débutant ligne %d\n"
 
-#: src/lib/lex.c:278
+#: src/lib/lex.c:281
 msgid "none"
 msgstr "none"
 
-#: src/lib/lex.c:279
+#: src/lib/lex.c:282
 msgid "comment"
 msgstr "comment"
 
-#: src/lib/lex.c:280
+#: src/lib/lex.c:283
 msgid "number"
 msgstr "number"
 
-#: src/lib/lex.c:281
+#: src/lib/lex.c:284
 msgid "ip_addr"
 msgstr "ip_addr"
 
 # identifiant
-#: src/lib/lex.c:282
+#: src/lib/lex.c:285
 msgid "identifier"
 msgstr "identifier"
 
-#: src/lib/lex.c:283
+#: src/lib/lex.c:286
 msgid "string"
 msgstr "string"
 
-#: src/lib/lex.c:284
+#: src/lib/lex.c:287
 msgid "quoted_string"
 msgstr "quoted_string"
 
-#: src/lib/lex.c:285
+#: src/lib/lex.c:288
 #, fuzzy
 msgid "include"
 msgstr "Depuis"
 
-#: src/lib/lex.c:286
+#: src/lib/lex.c:289
 #, fuzzy
 msgid "include_quoted_string"
 msgstr "quoted_string"
 
-#: src/lib/lex.c:287
+#: src/lib/lex.c:290
 msgid "UTF-8 Byte Order Mark"
 msgstr ""
 
-#: src/lib/lex.c:288
+#: src/lib/lex.c:291
 msgid "UTF-16le Byte Order Mark"
 msgstr ""
 
-#: src/lib/lex.c:326 src/lib/lex.c:332 src/lib/lex.c:343 src/lib/lex.c:349
+#: src/lib/lex.c:329 src/lib/lex.c:335 src/lib/lex.c:346 src/lib/lex.c:352
 #, c-format
 msgid "expected a positive integer number, got: %s"
 msgstr "attendait un nombre entier positif, pas : %s"
 
-#: src/lib/lex.c:465
+#: src/lib/lex.c:468
 msgid ""
 "This config file appears to be in an unsupported Unicode format (UTF-16be). "
 "Please resave as UTF-8\n"
 msgstr ""
 
-#: src/lib/lex.c:611 src/lib/lex.c:639
+#: src/lib/lex.c:614 src/lib/lex.c:642
 #, c-format
 msgid "Cannot open included config file %s: %s\n"
 msgstr "Impossible d'ouvrir le fichier de configuration inclus %s : %s\n"
 
-#: src/lib/lex.c:698 src/lib/lex.c:755
+#: src/lib/lex.c:701 src/lib/lex.c:758
 #, c-format
 msgid "expected an integer or a range, got %s: %s"
 msgstr "attendait un entier ou bien un intervalle, pas %s : %s"
 
-#: src/lib/lex.c:712 src/lib/lex.c:720 src/lib/lex.c:731 src/lib/lex.c:739
+#: src/lib/lex.c:715 src/lib/lex.c:723 src/lib/lex.c:734 src/lib/lex.c:742
 #, c-format
 msgid "expected an integer number, got %s: %s"
 msgstr "attendait un nombre entier, pas %s : %s"
 
-#: src/lib/lex.c:769
+#: src/lib/lex.c:772
 #, c-format
 msgid "expected a name, got %s: %s"
 msgstr "attendait un nom, pas %s : %s"
 
-#: src/lib/lex.c:773
+#: src/lib/lex.c:776
 #, c-format
 msgid "name %s length %d too long, max is %d\n"
 msgstr "la longueur du nom %s (%d) est trop grande, le max est %d\n"
 
-#: src/lib/lex.c:781
+#: src/lib/lex.c:784
 #, c-format
 msgid "expected a string, got %s: %s"
 msgstr "attendait une chaîne, pas %s : %s"
@@ -8664,8 +8664,7 @@ msgstr ""
 msgid "Could not add job queue: ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:121 src/dird/ua_output.c:714 src/dird/xua_output.c:869
-#: src/tools/cats_test.c:363
+#: src/dird/job.c:121 src/dird/ua_output.c:714 src/tools/cats_test.c:363
 #, c-format
 msgid "Could not open database \"%s\".\n"
 msgstr "Impossible d'ouvrir la base de données \"%s\".\n"
@@ -8999,17 +8998,16 @@ msgstr ""
 "  Statut de fin du SD :    %s\n"
 "  Statut de fin :          %s\n"
 
-#: src/dird/ua_output.c:57 src/dird/ua_output.c:81 src/dird/xua_output.c:56
-#: src/dird/xua_output.c:80
+#: src/dird/ua_output.c:57 src/dird/ua_output.c:81
 msgid "ON or OFF keyword missing.\n"
 msgstr "Mot clef ON ou OFF manquant.\n"
 
-#: src/dird/ua_output.c:101 src/dird/xua_output.c:100
+#: src/dird/ua_output.c:101
 #, fuzzy
 msgid "Disabled Jobs:\n"
 msgstr "est bloqué"
 
-#: src/dird/ua_output.c:107 src/dird/xua_output.c:106
+#: src/dird/ua_output.c:107
 #, fuzzy
 msgid "No disabled Jobs.\n"
 msgstr "Pas de job programmé.\n"
@@ -9019,94 +9017,93 @@ msgstr "Pas de job programmé.\n"
 msgid "disabled"
 msgstr "est bloqué"
 
-#: src/dird/ua_output.c:199 src/dird/xua_output.c:204
+#: src/dird/ua_output.c:199
 msgid "Keywords for the show command are:\n"
 msgstr ""
 
-#: src/dird/ua_output.c:205 src/dird/xua_output.c:211
+#: src/dird/ua_output.c:205
 #, c-format
 msgid "%s resource %s not found.\n"
 msgstr "%s ressource %s introuvable.\n"
 
-#: src/dird/ua_output.c:208 src/dird/xua_output.c:215
+#: src/dird/ua_output.c:208
 #, c-format
 msgid "Resource %s not found\n"
 msgstr "Ressource %s introuvable\n"
 
-#: src/dird/ua_output.c:278 src/dird/xua_output.c:356
+#: src/dird/ua_output.c:278
 msgid "Hey! DB is NULL\n"
 msgstr ""
 
-#: src/dird/ua_output.c:435 src/dird/xua_output.c:590
+#: src/dird/ua_output.c:435
 #, c-format
 msgid "Jobid %d used %d Volume(s): %s\n"
 msgstr "JobId %d a utilisé %d volume(s) : %s\n"
 
-#: src/dird/ua_output.c:454 src/dird/xua_output.c:609
+#: src/dird/ua_output.c:454
 msgid "No Pool specified.\n"
 msgstr "Pas de Pool spécifié.\n"
 
-#: src/dird/ua_output.c:465 src/dird/ua_select.c:531 src/dird/xua_output.c:620
-#: src/dird/ua_update.c:424
+#: src/dird/ua_output.c:465 src/dird/ua_select.c:531 src/dird/ua_update.c:424
 #, c-format
 msgid "Error obtaining pool ids. ERR=%s\n"
 msgstr "Erreur pendant lors de la récupération du pool. ERR=%s\n"
 
-#: src/dird/ua_output.c:475 src/dird/xua_output.c:630
+#: src/dird/ua_output.c:475
 #, c-format
 msgid "Pool: %s\n"
 msgstr "Pool : %s\n"
 
-#: src/dird/ua_output.c:491 src/dird/xua_output.c:646
+#: src/dird/ua_output.c:491
 msgid "Ignoring invalid value for days. Max is 50.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:513 src/dird/xua_output.c:668
+#: src/dird/ua_output.c:513
 #, c-format
 msgid "Unknown list keyword: %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:538 src/dird/xua_output.c:693
+#: src/dird/ua_output.c:538
 #, c-format
 msgid "%s is not a job name.\n"
 msgstr "%s n'est pas un nom de job.\n"
 
-#: src/dird/ua_output.c:552 src/dird/xua_output.c:707
+#: src/dird/ua_output.c:552
 #, fuzzy, c-format
 msgid "Could not find Pool for Job %s\n"
 msgstr "Impossible d'ouvrir le device %s\n"
 
-#: src/dird/ua_output.c:565 src/dird/xua_output.c:720
+#: src/dird/ua_output.c:565
 #, fuzzy, c-format
 msgid "Could not find next Volume for Job %s (Pool=%s, Level=%s).\n"
 msgstr "Impossible de trouver le prochain Volume pour le Job %s (%s, %s).\n"
 
-#: src/dird/ua_output.c:569 src/dird/xua_output.c:724
+#: src/dird/ua_output.c:569
 #, fuzzy, c-format
 msgid ""
 "The next Volume to be used by Job \"%s\" (Pool=%s, Level=%s) will be %s\n"
 msgstr "Le prochain Volume utilisé par le Job \"%s\" (%s, %s) sera %s\n"
 
-#: src/dird/ua_output.c:582 src/dird/xua_output.c:737
+#: src/dird/ua_output.c:582
 #, c-format
 msgid "Could not find next Volume for Job %s.\n"
 msgstr "Impossible de trouver le prochain volume pour le Job %s.\n"
 
-#: src/dird/ua_output.c:727 src/dird/xua_output.c:882
+#: src/dird/ua_output.c:727
 #, c-format
 msgid "Pool %s not in database. %s"
 msgstr "Pool %s introuvable en base. %s"
 
-#: src/dird/ua_output.c:735 src/dird/xua_output.c:890
+#: src/dird/ua_output.c:735
 #, c-format
 msgid "Pool %s created in database.\n"
 msgstr "Pool %s créé en base.\n"
 
-#: src/dird/ua_output.c:788 src/dird/xua_output.c:943
+#: src/dird/ua_output.c:788
 msgid "You have no messages.\n"
 msgstr "Vous n'avez pas de messages.\n"
 
-#: src/dird/ua_output.c:868 src/dird/xua_output.c:1023
+#: src/dird/ua_output.c:868
 msgid "Message too long to display.\n"
 msgstr ""
 
@@ -13511,20 +13508,6 @@ msgstr ""
 msgid "Director's connection to SD for this Job was lost.\n"
 msgstr ""
 
-#: src/dird/xua_output.c:518
-#, fuzzy
-msgid "Invalid jobid argument\n"
-msgstr "argument invalide"
-
-#: src/dird/xua_output.c:542
-#, fuzzy, c-format
-msgid "Unknown ObjectType %s\n"
-msgstr "Mot clef inconnu : %s\n"
-
-#: src/dird/xua_output.c:552
-msgid "list pluginrestoreconf requires jobid argument\n"
-msgstr ""
-
 #: src/dird/getmsg.c:160
 #, c-format
 msgid "bget_dirmsg: unknown bnet signal %d\n"
@@ -17635,7 +17618,7 @@ msgstr ""
 msgid "DROP-Stmt went wrong\n"
 msgstr ""
 
-#: examples/nagios/check_bacula/check_bacula.c:59
+#: examples/nagios/check_bacula/check_bacula.c:57
 #, c-format
 msgid ""
 "Copyright (C) 2005 Christian Masopust\n"
@@ -17653,62 +17636,62 @@ msgstr "===================================================================\n"
 msgid "Failed ASSERT: %s\n"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:79
+#: src/qt-console/bcomm/dircomm.cpp:85
 #, fuzzy, c-format
 msgid "Already connected\"%s\".\n"
 msgstr "Console connecté à %s\n"
 
-#: src/qt-console/bcomm/dircomm.cpp:90
+#: src/qt-console/bcomm/dircomm.cpp:96
 #: src/qt-console/tray-monitor/tray-monitor.cpp:347
 #, fuzzy, c-format
 msgid "Connecting to Director %s:%d"
 msgstr "Connexion au Director %s:%d\n"
 
-#: src/qt-console/bcomm/dircomm.cpp:92
+#: src/qt-console/bcomm/dircomm.cpp:98
 #, fuzzy, c-format
 msgid ""
 "Connecting to Director %s:%d\n"
 "\n"
 msgstr "Connexion au Director %s:%d\n"
 
-#: src/qt-console/bcomm/dircomm.cpp:163
-#: src/qt-console/tray-monitor/tray-monitor.cpp:349
+#: src/qt-console/bcomm/dircomm.cpp:195
+#: src/qt-console/tray-monitor/tray-monitor.cpp:352
 #, fuzzy
 msgid "Director daemon"
 msgstr "Director"
 
-#: src/qt-console/bcomm/dircomm.cpp:201
+#: src/qt-console/bcomm/dircomm.cpp:233
 msgid "Initializing ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:217 src/qt-console/console/console.cpp:130
+#: src/qt-console/bcomm/dircomm.cpp:249 src/qt-console/console/console.cpp:130
 #, fuzzy
 msgid "Connected"
 msgstr "Connexion...\n"
 
-#: src/qt-console/bcomm/dircomm.cpp:341
+#: src/qt-console/bcomm/dircomm.cpp:373
 #, fuzzy
 msgid "Command completed ..."
 msgstr "Commande annulée.\n"
 
-#: src/qt-console/bcomm/dircomm.cpp:348 src/qt-console/console/console.cpp:367
+#: src/qt-console/bcomm/dircomm.cpp:380 src/qt-console/console/console.cpp:367
 msgid "Processing command ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:355
+#: src/qt-console/bcomm/dircomm.cpp:387
 msgid "At main prompt waiting for input ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:362 src/qt-console/bcomm/dircomm.cpp:375
+#: src/qt-console/bcomm/dircomm.cpp:394 src/qt-console/bcomm/dircomm.cpp:407
 msgid "At prompt waiting for input ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:383
+#: src/qt-console/bcomm/dircomm.cpp:415
 #, fuzzy
 msgid "Command failed."
 msgstr "Commande annulée.\n"
 
-#: src/qt-console/bcomm/dircomm.cpp:455
+#: src/qt-console/bcomm/dircomm.cpp:487
 #, fuzzy
 msgid "Director disconnected."
 msgstr "Connexion du director le %s\n"
@@ -17734,7 +17717,7 @@ msgid "Storage: name=%s address=%s SDport=%d\n"
 msgstr ""
 
 #: src/qt-console/tray-monitor/tray_conf.cpp:183
-#: src/qt-console/bat_conf.cpp:145
+#: src/qt-console/bat_conf.cpp:146
 #, c-format
 msgid "ConsoleFont: name=%s font face=%s\n"
 msgstr ""
@@ -17792,56 +17775,56 @@ msgstr ""
 msgid "Error, currentitem is not a Client or a Storage..\n"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:354
+#: src/qt-console/tray-monitor/tray-monitor.cpp:357
 #, fuzzy, c-format
 msgid "Connecting to Client %s:%d"
 msgstr "Connexion au client %s (%s:%d)\n"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:356
+#: src/qt-console/tray-monitor/tray-monitor.cpp:362
 msgid "File daemon"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:361
+#: src/qt-console/tray-monitor/tray-monitor.cpp:367
 #, fuzzy, c-format
 msgid "Connecting to Storage %s:%d"
 msgstr "Connexion au Director %s:%d\n"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:367
-#: src/qt-console/tray-monitor/tray-monitor.cpp:397
+#: src/qt-console/tray-monitor/tray-monitor.cpp:376
+#: src/qt-console/tray-monitor/tray-monitor.cpp:406
 #, c-format
 msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:372
+#: src/qt-console/tray-monitor/tray-monitor.cpp:381
 #, fuzzy
 msgid "Cannot connect to daemon."
 msgstr "Impossible de se connecter au démon Storage\n"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:381
+#: src/qt-console/tray-monitor/tray-monitor.cpp:390
 #, fuzzy, c-format
 msgid "Authentication error : %s"
 msgstr "Erreur sur l'autochangeur : ERR=%s\n"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:388
+#: src/qt-console/tray-monitor/tray-monitor.cpp:397
 #, fuzzy
 msgid "Opened connection with Director daemon."
 msgstr "Impossible de se connecter au Storage daemon.\n"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:391
+#: src/qt-console/tray-monitor/tray-monitor.cpp:400
 #, fuzzy
 msgid "Opened connection with File daemon."
 msgstr "Impossible de se connecter au client.\n"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:394
+#: src/qt-console/tray-monitor/tray-monitor.cpp:403
 #, fuzzy
 msgid "Opened connection with Storage daemon."
 msgstr "Impossible de se connecter au Storage daemon.\n"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:445
+#: src/qt-console/tray-monitor/tray-monitor.cpp:454
 msgid "Error : BNET_HARDEOF or BNET_ERROR"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:454
+#: src/qt-console/tray-monitor/tray-monitor.cpp:463
 #, fuzzy
 msgid "Error : Connection closed."
 msgstr "Connexion...\n"
@@ -17908,12 +17891,20 @@ msgstr ""
 "       -t          test - lecture de la configuration et sortie\n"
 "\n"
 
-#: src/qt-console/bat_conf.cpp:142
+#: src/qt-console/bat_conf.cpp:143
 #, fuzzy, c-format
 msgid "Console: name=%s\n"
 msgstr "Console connecté à %s\n"
 
 #, fuzzy
+#~ msgid "Invalid jobid argument\n"
+#~ msgstr "argument invalide"
+
+#, fuzzy
+#~ msgid "Unknown ObjectType %s\n"
+#~ msgstr "Mot clef inconnu : %s\n"
+
+#, fuzzy
 #~ msgid "Cannot run free space command. Results=%s ERR=%s\n"
 #~ msgstr "Impossible de lancer la commande : %s. ERR=%s\n"
 
@@ -18317,10 +18308,6 @@ msgstr "Console connecté à %s\n"
 #~ msgstr "La création de la signature a échouée"
 
 #, fuzzy
-#~ msgid "# Bacula bwx-console Configuration File\n"
-#~ msgstr "Merci de corriger le fichier de configuration : %s\n"
-
-#, fuzzy
 #~ msgid "Close without saving"
 #~ msgstr "Terminé avec des avertissements"
 
@@ -18708,10 +18695,6 @@ msgstr "Console connecté à %s\n"
 #~ msgstr "Les valeurs possibles sont :\n"
 
 #, fuzzy
-#~ msgid "Bacula bwx-console"
-#~ msgstr "Message de Bacula"
-
-#, fuzzy
 #~ msgid "Connect"
 #~ msgstr "Connexion...\n"
 
@@ -18773,10 +18756,6 @@ msgstr "Console connecté à %s\n"
 #~ msgstr "Connexion au Director %s:%d\n"
 
 #, fuzzy
-#~ msgid "About Bacula bwx-console"
-#~ msgstr "Message de Bacula"
-
-#, fuzzy
 #~ msgid "Please choose your default configuration file"
 #~ msgstr "Merci de corriger le fichier de configuration : %s\n"
 
@@ -19144,29 +19123,6 @@ msgstr "Console connecté à %s\n"
 #~ msgstr "Saisissez le type"
 
 #, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Version: %s (%s) %s %s %s\n"
-#~ "\n"
-#~ "Usage: bgnome-console [-s] [-c config_file] [-d debug_level] "
-#~ "[config_file]\n"
-#~ "       -c <file>   set configuration file to file\n"
-#~ "       -dnn        set debug level to nn\n"
-#~ "       -s          no signals\n"
-#~ "       -t          test - read configuration and exit\n"
-#~ "       -?          print this message.\n"
-#~ "\n"
-#~ msgstr ""
-#~ ") %s %s %s\n"
-#~ "\n"
-#~ "Usage : bconsole [-s] [-c config_file] [-d niveau_debug]\n"
-#~ "       -c <file>   set configuration file to file\n"
-#~ "       -dnn        set debug level to nn\n"
-#~ "       -s          no signals\n"
-#~ "       -t          test - lecture de la configuration et sortie\n"
-#~ "\n"
-
-#, fuzzy
 #~ msgid "Pthread cond init error = %s\n"
 #~ msgstr "Erreur pendant l'écriture des attributs dans le spool. ERR=%s\n"
 
diff --git a/bacula/po/it.po b/bacula/po/it.po
index 5164de5..4350b55 100644
--- a/bacula/po/it.po
+++ b/bacula/po/it.po
@@ -609,7 +609,6 @@ msgid ""
 msgstr ""
 
 #: src/dird/authenticate.c:80 src/dird/authenticate.c:81
-#: src/tray-monitor/authenticate.c:132
 #, c-format
 msgid "Error sending Hello to Storage daemon. ERR=%s\n"
 msgstr ""
@@ -632,7 +631,7 @@ msgstr ""
 
 #: src/dird/authenticate.c:120 src/console/authenticate.c:114
 #: src/filed/authenticate.c:251 src/stored/authenticate.c:131
-#: src/stored/authenticate.c:232 src/wx-console/authenticate.c:127
+#: src/stored/authenticate.c:232
 msgid ""
 "Authorization problem: Remote server did not advertise required TLS "
 "support.\n"
@@ -641,7 +640,6 @@ msgstr ""
 #: src/dird/authenticate.c:127 src/console/authenticate.c:121
 #: src/filed/authenticate.c:147 src/filed/authenticate.c:259
 #: src/stored/authenticate.c:139 src/stored/authenticate.c:240
-#: src/wx-console/authenticate.c:133
 msgid "Authorization problem: Remote server requires TLS.\n"
 msgstr ""
 
@@ -655,7 +653,7 @@ msgstr ""
 msgid "bdird<stored: \"%s:%s\" bad response to Hello command: ERR=%s\n"
 msgstr ""
 
-#: src/dird/authenticate.c:152 src/tray-monitor/authenticate.c:152
+#: src/dird/authenticate.c:152
 msgid "Storage daemon rejected Hello command\n"
 msgstr ""
 
@@ -700,7 +698,7 @@ msgstr ""
 msgid "TLS negotiation failed with FD at \"%s:%d\".\n"
 msgstr ""
 
-#: src/dird/authenticate.c:250 src/tray-monitor/authenticate.c:191
+#: src/dird/authenticate.c:250
 #, c-format
 msgid "Bad response from File daemon to Hello command: ERR=%s\n"
 msgstr ""
@@ -710,7 +708,7 @@ msgstr ""
 msgid "Bad response from File daemon at \"%s:%d\" to Hello command: ERR=%s\n"
 msgstr ""
 
-#: src/dird/authenticate.c:259 src/tray-monitor/authenticate.c:198
+#: src/dird/authenticate.c:259
 msgid "File daemon rejected Hello command\n"
 msgstr ""
 
@@ -1037,13 +1035,13 @@ msgid ""
 msgstr ""
 
 #: src/dird/dird.c:224 src/console/console.c:426 src/filed/filed.c:182
-#: src/gnome2-console/console.c:286 src/stored/stored.c:210
+#: src/stored/stored.c:210
 msgid "Cryptography library initialization failed.\n"
 msgstr ""
 
 #: src/dird/dird.c:228 src/dird/dird.c:234 src/dird/dird.c:474
 #: src/dird/dird.c:477 src/console/console.c:430 src/filed/filed.c:187
-#: src/gnome2-console/console.c:290 src/stored/stored.c:214
+#: src/stored/stored.c:214
 #, c-format
 msgid "Please correct configuration file: %s\n"
 msgstr ""
@@ -1080,9 +1078,7 @@ msgstr ""
 #: src/dird/dird.c:563 src/dird/dird.c:764 src/dird/dird.c:816
 #: src/dird/dird.c:920 src/console/console.c:657 src/console/console.c:686
 #: src/filed/filed.c:288 src/filed/filed.c:446
-#: src/gnome2-console/console.c:153 src/gnome2-console/console.c:182
-#: src/stored/stored.c:332 src/wx-console/console_thread.cpp:114
-#: src/wx-console/console_thread.cpp:140
+#: src/stored/stored.c:332
 msgid "TLS required but not configured in Bacula.\n"
 msgstr ""
 
@@ -1185,7 +1181,7 @@ msgstr ""
 msgid "Failed to initialize TLS context for Storage \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:508 src/tray-monitor/tray_conf.c:168
+#: src/dird/dird_conf.c:508
 #, c-format
 msgid "No %s resource defined\n"
 msgstr ""
@@ -1459,26 +1455,24 @@ msgstr ""
 msgid "      opcmd=%s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:893 src/tray-monitor/tray_conf.c:199
+#: src/dird/dird_conf.c:893
 #, c-format
 msgid "Unknown resource type %d in dump_resource.\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1199 src/tray-monitor/tray_conf.c:257
+#: src/dird/dird_conf.c:1199
 #, c-format
 msgid "Unknown resource type %d in free_resource.\n"
 msgstr ""
 
 #: src/dird/dird_conf.c:1231 src/dird/dird_conf.c:1246
 #: src/dird/dird_conf.c:1842 src/console/console_conf.c:257
-#: src/filed/filed_conf.c:347 src/gnome2-console/console_conf.c:258
-#: src/tray-monitor/tray_conf.c:288 src/wx-console/console_conf.c:265
+#: src/filed/filed_conf.c:347
 #, c-format
 msgid "%s item is required in %s resource, but not found.\n"
 msgstr ""
 
 #: src/dird/dird_conf.c:1237 src/lib/parse_conf.c:234
-#: src/tray-monitor/tray_conf.c:294
 #, c-format
 msgid "Too many items in %s resource\n"
 msgstr ""
@@ -1525,7 +1519,6 @@ msgid "Cannot find Schedule resource %s\n"
 msgstr ""
 
 #: src/dird/dird_conf.c:1383 src/dird/dird_conf.c:1443
-#: src/tray-monitor/tray_conf.c:314 src/tray-monitor/tray_conf.c:352
 #, c-format
 msgid "Unknown resource type %d in save_resource.\n"
 msgstr ""
@@ -1536,8 +1529,7 @@ msgid "Name item is required in %s resource, but not found.\n"
 msgstr ""
 
 #: src/dird/dird_conf.c:1466 src/console/console_conf.c:320
-#: src/filed/filed_conf.c:432 src/gnome2-console/console_conf.c:327
-#: src/tray-monitor/tray_conf.c:372 src/wx-console/console_conf.c:328
+#: src/filed/filed_conf.c:432
 #, c-format
 msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
 msgstr ""
@@ -1634,7 +1626,7 @@ msgstr ""
 msgid "Cannot destroy var context: ERR=%s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:94 src/tray-monitor/tray-monitor.c:914
+#: src/dird/fd_cmds.c:94
 msgid "File daemon"
 msgstr ""
 
@@ -2229,7 +2221,6 @@ msgid "Storage from Pool's NextPool resource"
 msgstr ""
 
 #: src/dird/msgchan.c:106 src/filed/job.c:1301
-#: src/tray-monitor/tray-monitor.c:921
 msgid "Storage daemon"
 msgstr ""
 
@@ -2964,33 +2955,12 @@ msgid "Director"
 msgstr ""
 
 #: src/dird/ua_cmds.c:998 src/dird/ua_dotcmds.c:284 src/dird/ua_run.c:265
-#: src/dird/ua_select.c:168 src/wx-console/wxbrestorepanel.cpp:339
-#: src/wx-console/wxbrestorepanel.cpp:355
-#: src/wx-console/wxbrestorepanel.cpp:479
-#: src/wx-console/wxbrestorepanel.cpp:480
-#: src/wx-console/wxbrestorepanel.cpp:490
-#: src/wx-console/wxbrestorepanel.cpp:491
-#: src/wx-console/wxbrestorepanel.cpp:1154
-#: src/wx-console/wxbrestorepanel.cpp:1818
-#: src/wx-console/wxbrestorepanel.cpp:1889
+#: src/dird/ua_select.c:168
 msgid "Storage"
 msgstr ""
 
 #: src/dird/ua_cmds.c:999 src/dird/ua_dotcmds.c:285 src/dird/ua_run.c:271
 #: src/dird/ua_select.c:311 src/dird/ua_select.c:420
-#: src/wx-console/wxbrestorepanel.cpp:336
-#: src/wx-console/wxbrestorepanel.cpp:354
-#: src/wx-console/wxbrestorepanel.cpp:431
-#: src/wx-console/wxbrestorepanel.cpp:432
-#: src/wx-console/wxbrestorepanel.cpp:442
-#: src/wx-console/wxbrestorepanel.cpp:443
-#: src/wx-console/wxbrestorepanel.cpp:690
-#: src/wx-console/wxbrestorepanel.cpp:1124
-#: src/wx-console/wxbrestorepanel.cpp:1211
-#: src/wx-console/wxbrestorepanel.cpp:1811
-#: src/wx-console/wxbrestorepanel.cpp:1813
-#: src/wx-console/wxbrestorepanel.cpp:1887
-#: src/wx-console/wxbrestorepanel.cpp:1943
 msgid "Client"
 msgstr ""
 
@@ -3704,7 +3674,7 @@ msgid "Enter a list of directories to restore for found JobIds"
 msgstr ""
 
 #: src/dird/ua_restore.c:418 src/dird/ua_status.c:760 src/filed/status.c:256
-#: src/stored/status.c:521 src/wx-console/wxbconfigpanel.cpp:212
+#: src/stored/status.c:521
 msgid "Cancel"
 msgstr ""
 
@@ -3998,23 +3968,16 @@ msgstr ""
 msgid "Restore Client"
 msgstr ""
 
-#: src/dird/ua_run.c:273 src/wx-console/wxbrestorepanel.cpp:356
-#: src/wx-console/wxbrestorepanel.cpp:844
-#: src/wx-console/wxbrestorepanel.cpp:1891
+#: src/dird/ua_run.c:273
 msgid "When"
 msgstr ""
 
-#: src/dird/ua_run.c:274 src/wx-console/wxbrestorepanel.cpp:357
-#: src/wx-console/wxbrestorepanel.cpp:1117
-#: src/wx-console/wxbrestorepanel.cpp:1894
+#: src/dird/ua_run.c:274
 msgid "Priority"
 msgstr ""
 
 #: src/dird/ua_run.c:278 src/dird/ua_select.c:506 src/dird/ua_select.c:596
-#: src/dird/ua_update.c:529 src/wx-console/wxbrestorepanel.cpp:338
-#: src/wx-console/wxbrestorepanel.cpp:527
-#: src/wx-console/wxbrestorepanel.cpp:537
-#: src/wx-console/wxbrestorepanel.cpp:1807
+#: src/dird/ua_update.c:529
 msgid "Pool"
 msgstr ""
 
@@ -4022,14 +3985,11 @@ msgstr ""
 msgid "Verify Job"
 msgstr ""
 
-#: src/dird/ua_run.c:283 src/wx-console/wxbrestorepanel.cpp:349
-#: src/wx-console/wxbrestorepanel.cpp:1872
+#: src/dird/ua_run.c:283
 msgid "Bootstrap"
 msgstr ""
 
-#: src/dird/ua_run.c:284 src/wx-console/wxbrestorepanel.cpp:350
-#: src/wx-console/wxbrestorepanel.cpp:1093
-#: src/wx-console/wxbrestorepanel.cpp:1874
+#: src/dird/ua_run.c:284
 msgid "Where"
 msgstr ""
 
@@ -4037,13 +3997,7 @@ msgstr ""
 msgid "File Relocation"
 msgstr ""
 
-#: src/dird/ua_run.c:286 src/wx-console/wxbrestorepanel.cpp:352
-#: src/wx-console/wxbrestorepanel.cpp:1101
-#: src/wx-console/wxbrestorepanel.cpp:1878
-#: src/wx-console/wxbrestorepanel.cpp:1879
-#: src/wx-console/wxbrestorepanel.cpp:1880
-#: src/wx-console/wxbrestorepanel.cpp:1881
-#: src/wx-console/wxbrestorepanel.cpp:1882
+#: src/dird/ua_run.c:286
 msgid "Replace"
 msgstr ""
 
@@ -5020,7 +4974,6 @@ msgstr ""
 
 #: src/dird/ua_status.c:763 src/filed/status.c:259 src/lib/util.c:188
 #: src/lib/util.c:255 src/stored/btape.c:1189 src/stored/status.c:524
-#: src/wx-console/wxbconfigpanel.cpp:201
 msgid "OK"
 msgstr ""
 
@@ -5789,22 +5742,20 @@ msgstr ""
 msgid "File: %s\n"
 msgstr ""
 
-#: src/console/authenticate.c:131 src/wx-console/authenticate.c:142
+#: src/console/authenticate.c:131
 msgid "TLS negotiation failed\n"
 msgstr ""
 
-#: src/console/authenticate.c:143 src/gnome2-console/authenticate.c:98
-#: src/tray-monitor/authenticate.c:97
+#: src/console/authenticate.c:143
 #, c-format
 msgid "Bad response to Hello command: ERR=%s\n"
 msgstr ""
 
-#: src/console/authenticate.c:150 src/gnome2-console/authenticate.c:108
-#: src/tray-monitor/authenticate.c:104 src/wx-console/authenticate.c:157
+#: src/console/authenticate.c:150
 msgid "Director rejected Hello command\n"
 msgstr ""
 
-#: src/console/authenticate.c:160 src/wx-console/authenticate.c:167
+#: src/console/authenticate.c:160
 msgid ""
 "Director authorization problem.\n"
 "Most likely the passwords do not agree.\n"
@@ -5895,48 +5846,15 @@ msgstr ""
 msgid "You must enter a number between 1 and %d\n"
 msgstr ""
 
-#: src/console/console.c:521 src/tray-monitor/tray-monitor.c:905
+#: src/console/console.c:521
 #, c-format
 msgid "Connecting to Director %s:%d\n"
 msgstr ""
 
-#: src/console/console.c:538 src/gnome2-console/console.c:526
-#: src/wx-console/console_thread.cpp:391
-#, c-format
-msgid "Failed to initialize TLS context for Console \"%s\".\n"
-msgstr ""
-
-#: src/console/console.c:558 src/gnome2-console/console.c:548
-#: src/wx-console/console_thread.cpp:412
-#, c-format
-msgid "Failed to initialize TLS context for Director \"%s\".\n"
-msgstr ""
-
 #: src/console/console.c:588
 msgid "Enter a period to cancel a command.\n"
 msgstr ""
 
-#: src/console/console.c:664 src/gnome2-console/console.c:160
-#, c-format
-msgid ""
-"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
-"Director \"%s\" in %s. At least one CA certificate store is required.\n"
-msgstr ""
-
-#: src/console/console.c:673 src/gnome2-console/console.c:169
-#, c-format
-msgid ""
-"No Director resource defined in %s\n"
-"Without that I don't how to speak to the Director :-(\n"
-msgstr ""
-
-#: src/console/console.c:693 src/gnome2-console/console.c:189
-#, c-format
-msgid ""
-"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
-"Console \"%s\" in %s.\n"
-msgstr ""
-
 #: src/console/console.c:849
 msgid "Too many arguments on input command.\n"
 msgstr ""
@@ -5973,32 +5891,21 @@ msgstr ""
 msgid "Autochanger error: ERR=%s\n"
 msgstr ""
 
-#: src/console/console_conf.c:138 src/gnome2-console/console_conf.c:134
-#: src/wx-console/console_conf.c:147
+#: src/console/console_conf.c:138
 #, c-format
 msgid "No record for %d %s\n"
 msgstr ""
 
-#: src/console/console_conf.c:147 src/wx-console/console_conf.c:156
+#: src/console/console_conf.c:147
 #, c-format
 msgid "Console: name=%s rcfile=%s histfile=%s\n"
 msgstr ""
 
-#: src/console/console_conf.c:151 src/gnome2-console/console_conf.c:143
-#: src/wx-console/console_conf.c:160
-#, c-format
-msgid "Director: name=%s address=%s DIRport=%d\n"
-msgstr ""
-
 #: src/console/console_conf.c:155 src/console/console_conf.c:231
 #: src/console/console_conf.c:276 src/console/console_conf.c:303
 #: src/filed/filed_conf.c:319 src/filed/filed_conf.c:384
-#: src/filed/filed_conf.c:414 src/gnome2-console/console_conf.c:154
-#: src/gnome2-console/console_conf.c:232 src/gnome2-console/console_conf.c:280
-#: src/gnome2-console/console_conf.c:310 src/stored/stored_conf.c:528
+#: src/filed/filed_conf.c:414 src/stored/stored_conf.c:528
 #: src/stored/stored_conf.c:616 src/stored/stored_conf.c:651
-#: src/wx-console/console_conf.c:164 src/wx-console/console_conf.c:239
-#: src/wx-console/console_conf.c:284 src/wx-console/console_conf.c:311
 #, c-format
 msgid "Unknown resource type %d\n"
 msgstr ""
@@ -7289,345 +7196,10 @@ msgstr ""
 msgid "Cannot return to saved working directory: %s\n"
 msgstr ""
 
-#: src/gnome2-console/authenticate.c:87
-#, c-format
-msgid "%s: Director authorization problem.\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:88
-msgid "Director authorization problem.\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:90
-msgid ""
-"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for "
-"help.\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:100
-#, c-format
-msgid "%s: Bad response to Hello command: ERR=%s\n"
-msgstr ""
-
-#: src/gnome2-console/authenticate.c:102
-msgid "The Director is probably not running.\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:102
-#, c-format
-msgid ""
-"\n"
-"Version: %s (%s) %s %s %s\n"
-"\n"
-"Usage: bgnome-console [-s] [-c config_file] [-d debug_level] [config_file]\n"
-"       -c <file>   set configuration file to file\n"
-"       -dnn        set debug level to nn\n"
-"       -s          no signals\n"
-"       -t          test - read configuration and exit\n"
-"       -?          print this message.\n"
-"\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:234
-#, c-format
-msgid "Pthread cond init error = %s\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:379
-msgid " Not Connected"
-msgstr ""
-
-#: src/gnome2-console/console.c:500
-#, c-format
-msgid " Connecting to Director %s:%d"
-msgstr ""
-
-#: src/gnome2-console/console.c:501
-#, c-format
-msgid ""
-"Connecting to Director %s:%d\n"
-"\n"
-msgstr ""
-
-#: src/gnome2-console/console.c:516 src/wx-console/console_thread.cpp:381
-#, c-format
-msgid "Passphrase for Console \"%s\" TLS private key: "
-msgstr ""
-
-#: src/gnome2-console/console.c:538 src/wx-console/console_thread.cpp:402
-#, c-format
-msgid "Passphrase for Director \"%s\" TLS private key: "
-msgstr ""
-
-#: src/gnome2-console/console.c:557 src/tray-monitor/tray-monitor.c:907
-#: src/wx-console/console_thread.cpp:420
-msgid "Director daemon"
-msgstr ""
-
-#: src/gnome2-console/console.c:569
-msgid " Initializing ..."
-msgstr ""
-
-#: src/gnome2-console/console.c:605
-msgid " Connected"
-msgstr ""
-
-#: src/gnome2-console/console.c:613
-msgid " Processing command ..."
-msgstr ""
-
-#: src/gnome2-console/console.c:648
-msgid " At prompt waiting for input ..."
-msgstr ""
-
-#: src/gnome2-console/console.c:768
-msgid " Ready"
-msgstr ""
-
-#: src/gnome2-console/console_conf.c:147
-#, c-format
-msgid "Console: name=%s\n"
-msgstr ""
-
-#: src/gnome2-console/console_conf.c:150 src/tray-monitor/tray_conf.c:195
-#, c-format
-msgid "ConsoleFont: name=%s font face=%s\n"
-msgstr ""
-
-#: src/gnome2-console/interface.c:202
-msgid "Bacula Console"
-msgstr ""
-
-#: src/gnome2-console/interface.c:235 src/wx-console/wxbmainframe.cpp:248
-#: src/wx-console/wxbmainframe.cpp:619
-msgid "Connect"
-msgstr ""
-
-#: src/gnome2-console/interface.c:238
-msgid "Connect to Director"
-msgstr ""
-
-#: src/gnome2-console/interface.c:242
-msgid "Run"
-msgstr ""
-
-#: src/gnome2-console/interface.c:245 src/gnome2-console/interface.c:682
-#: src/gnome2-console/interface.c:696
-msgid "Run a Job"
-msgstr ""
-
-#: src/gnome2-console/interface.c:249
-msgid "Dir Status"
-msgstr ""
-
-#: src/gnome2-console/interface.c:255 src/lib/util.c:293
-#: src/wx-console/wxbrestorepanel.cpp:404
-#: src/wx-console/wxbrestorepanel.cpp:1974
+#: src/lib/util.c:293
 msgid "Restore"
 msgstr ""
 
-#: src/gnome2-console/interface.c:261
-msgid "Label"
-msgstr ""
-
-#: src/gnome2-console/interface.c:267
-msgid "Msgs"
-msgstr ""
-
-#: src/gnome2-console/interface.c:270
-msgid "Display Messages"
-msgstr ""
-
-#: src/gnome2-console/interface.c:294
-msgid " Command: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:303
-msgid "Enter Commands Here"
-msgstr ""
-
-#: src/gnome2-console/interface.c:314
-msgid " Status: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:323 src/gnome2-console/interface.c:1709
-msgid "  "
-msgstr ""
-
-#: src/gnome2-console/interface.c:424
-msgid "About Bacula Console"
-msgstr ""
-
-#: src/gnome2-console/interface.c:439
-msgid "Bacula Console\n"
-msgstr ""
-
-#: src/gnome2-console/interface.c:448
-msgid "Copyright (c) 2000 - 2004, Kern Sibbald and John Walker"
-msgstr ""
-
-#: src/gnome2-console/interface.c:453
-msgid "Authors: Kern Sibbald and John Walker"
-msgstr ""
-
-#: src/gnome2-console/interface.c:458
-msgid "The Leading Open Source Backup Solution."
-msgstr ""
-
-#: src/gnome2-console/interface.c:523 src/gnome2-console/interface.c:540
-msgid "Select Director"
-msgstr ""
-
-#: src/gnome2-console/interface.c:570
-msgid "         "
-msgstr ""
-
-#: src/gnome2-console/interface.c:715 src/gnome2-console/interface.c:1631
-msgid "Job:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:736
-msgid "   Type:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:756 src/gnome2-console/interface.c:785
-#: src/gnome2-console/interface.c:1284 src/gnome2-console/interface.c:1680
-msgid " "
-msgstr ""
-
-#: src/gnome2-console/interface.c:765 src/gnome2-console/interface.c:1660
-#: src/wx-console/wxbrestorepanel.cpp:1886
-msgid "Client:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:795 src/gnome2-console/interface.c:1689
-msgid "FileSet: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:820 src/wx-console/wxbrestorepanel.cpp:1893
-msgid "Priority:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:836
-msgid "Level:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:857
-msgid "             "
-msgstr ""
-
-#: src/gnome2-console/interface.c:867 src/gnome2-console/interface.c:1433
-#: src/gnome2-console/interface.c:1718
-msgid "Pool:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:888 src/gnome2-console/interface.c:919
-#: src/gnome2-console/interface.c:949 src/gnome2-console/interface.c:969
-#: src/gnome2-console/interface.c:989 src/gnome2-console/interface.c:1009
-#: src/gnome2-console/interface.c:1014 src/gnome2-console/interface.c:1483
-#: src/gnome2-console/interface.c:1739 src/gnome2-console/interface.c:1769
-#: src/gnome2-console/interface.c:1788 src/gnome2-console/interface.c:1793
-msgid "   "
-msgstr ""
-
-#: src/gnome2-console/interface.c:898 src/gnome2-console/interface.c:1407
-#: src/gnome2-console/interface.c:1748 src/wx-console/wxbrestorepanel.cpp:1888
-msgid "Storage:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:929
-msgid "Messages:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:959
-msgid "Where: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:979 src/wx-console/wxbrestorepanel.cpp:1890
-msgid "When:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:999 src/wx-console/wxbrestorepanel.cpp:1871
-msgid "Bootstrap:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1194
-msgid "Restore File Selection"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1238
-msgid "Current dir:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1265
-msgid "Files Selected: "
-msgstr ""
-
-#: src/gnome2-console/interface.c:1385 src/gnome2-console/interface.c:1396
-msgid "Label a Volume"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1458
-msgid "Volume Name:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1472
-msgid "Slot:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1598
-msgid "Restore Files Dialog"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1613
-msgid "Restore Files"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1778
-msgid "Before:"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1824
-msgid "Select Files"
-msgstr ""
-
-#: src/gnome2-console/interface.c:1907
-msgid "Progress"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149
-msgid "Mark"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149
-msgid "File"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149
-msgid "Mode"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:306
-msgid "User"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:310
-msgid "Group"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:294
-msgid "Size"
-msgstr ""
-
-#: src/gnome2-console/restore.c:149 src/wx-console/wxbrestorepanel.cpp:298
-msgid "Date"
-msgstr ""
-
-#: src/gnome2-console/support.c:60 src/gnome2-console/support.c:85
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
 #: src/lib/address_conf.c:63
 #, c-format
 msgid "Only ipv4 and ipv6 are supported (%d)\n"
@@ -8240,20 +7812,11 @@ msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Director.\n"
 msgstr ""
 
-#: src/lib/lex.c:93 src/wx-console/console_thread.cpp:208
+#: src/lib/lex.c:93
 #, c-format
 msgid "Problem probably begins at line %d.\n"
 msgstr ""
 
-#: src/lib/lex.c:98 src/wx-console/console_thread.cpp:213
-#, c-format
-msgid ""
-"Config error: %s\n"
-"            : line %d, col %d of file %s\n"
-"%s\n"
-"%s"
-msgstr ""
-
 #: src/lib/lex.c:102
 #, c-format
 msgid "Config error: %s\n"
@@ -9229,7 +8792,7 @@ msgstr ""
 msgid "Copy"
 msgstr ""
 
-#: src/lib/util.c:305 src/wx-console/wxbmainframe.cpp:276
+#: src/lib/util.c:305
 msgid "Console"
 msgstr ""
 
@@ -14540,432 +14103,50 @@ msgstr ""
 msgid "Skip: File system change prohibited. Directory not entered. %s\n"
 msgstr ""
 
-#: src/tray-monitor/authenticate.c:88
-msgid ""
-"Director authorization problem.\n"
-"Most likely the passwords do not agree.\n"
-"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for "
-"help.\n"
+#: src/baconfig.h:72
+#, c-format
+msgid "Failed ASSERT: %s\n"
 msgstr ""
 
-#: src/tray-monitor/authenticate.c:138
-msgid ""
-"Director and Storage daemon passwords or names not the same.\n"
-"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for "
-"help.\n"
+#: src/baconfig.h:79
+msgid "*None*"
 msgstr ""
 
-#: src/tray-monitor/authenticate.c:145
-#, c-format
-msgid "bdird<stored: bad response to Hello command: ERR=%s\n"
+#: src/win32/dird/winmain.cpp:193 src/win32/dird/winmain.cpp:200
+#: src/win32/filed/winmain.cpp:224 src/win32/filed/winmain.cpp:231
+#: src/win32/stored/baculasd/winmain.cpp:225
+#: src/win32/stored/baculasd/winmain.cpp:232
+msgid "Bacula Usage"
 msgstr ""
 
-#: src/tray-monitor/authenticate.c:178
-#, c-format
-msgid "Error sending Hello to File daemon. ERR=%s\n"
+#: src/win32/dird/winmain.cpp:197 src/win32/filed/winmain.cpp:228
+#: src/win32/stored/baculasd/winmain.cpp:229
+msgid "Bad Command Line Options"
 msgstr ""
 
-#: src/tray-monitor/authenticate.c:184
-msgid ""
-"Director and File daemon passwords or names not the same.\n"
-"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for "
-"help.\n"
+#: src/win32/dird/winservice.cpp:119 src/win32/filed/winservice.cpp:238
+#: src/win32/stored/baculasd/winservice.cpp:169
+msgid "StartServiceCtrlDispatcher failed."
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:113
-#, c-format
-msgid ""
-"Written by Nicolas Boichat (2004)\n"
-"\n"
-"Version: %s (%s) %s %s %s\n"
-"\n"
-"Usage: tray-monitor [-c config_file] [-d debug_level]\n"
-"       -c <file>     set configuration file to file\n"
-"       -dnn          set debug level to nn\n"
-"       -t            test - read configuration and exit\n"
-"       -?            print this message.\n"
-"\n"
+#: src/win32/dird/winservice.cpp:135 src/win32/filed/winservice.cpp:256
+#: src/win32/stored/baculasd/winservice.cpp:185
+msgid "RegisterServiceCtlHandler failed"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:262
-#, c-format
-msgid ""
-"Error: %d Monitor resources defined in %s. You must define one and only one "
-"Monitor resource.\n"
+#: src/win32/dird/winservice.cpp:136 src/win32/filed/winservice.cpp:257
+#: src/win32/stored/baculasd/winservice.cpp:186
+msgid "Contact Register Service Handler failure"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:293
-#, c-format
-msgid ""
-"No Client, Storage or Director resource defined in %s\n"
-"Without that I don't how to get status from the File, Storage or Director "
-"Daemon :-(\n"
+#: src/win32/dird/winservice.cpp:152 src/win32/filed/winservice.cpp:273
+#: src/win32/stored/baculasd/winservice.cpp:202
+msgid "ReportStatus STOPPED failed 1"
 msgstr ""
 
-#: src/tray-monitor/tray-monitor.c:315
-#, c-format
-msgid ""
-"Invalid refresh interval defined in %s\n"
-"This value must be greater or equal to 1 second and less or equal to 10 "
-"minutes (read value: %d).\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:330
-msgid "Open status window..."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:336
-msgid "Exit"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:348
-msgid "Bacula tray monitor"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:373
-msgid " (DIR)"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:377
-msgid " (FD)"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:381
-msgid " (SD)"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:394
-msgid "Unknown status."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:464
-msgid "Refresh interval in seconds: "
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:472
-msgid "Refresh now"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:476
-msgid "About"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:480
-msgid "Close"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:500
-#, c-format
-msgid "Disconnecting from Director %s:%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:503
-#, c-format
-msgid "Disconnecting from Client %s:%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:506
-#, c-format
-msgid "Disconnecting from Storage %s:%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:543 src/tray-monitor/tray-monitor.c:554
-msgid "Bacula Tray Monitor"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:545 src/tray-monitor/tray-monitor.c:556
-msgid "Written by Nicolas Boichat\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:546 src/tray-monitor/tray-monitor.c:557
-msgid "Version"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:625
-#, c-format
-msgid "Error, currentitem is not a Client or a Storage..\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:699
-#, c-format
-msgid ""
-"Current job: %s\n"
-"Last job: %s"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:711
-#, c-format
-msgid " (%d errors)"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:714
-#, c-format
-msgid " (%d error)"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:752
-msgid "No current job."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:755
-msgid "No last job."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:763
-msgid "Job status: Created"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:768
-msgid "Job status: Running"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:772
-msgid "Job status: Blocked"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:777
-msgid "Job status: Terminated"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:782
-msgid "Job status: Terminated in error"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:788
-msgid "Job status: Error"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:792
-msgid "Job status: Fatal error"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:797
-msgid "Job status: Verify differences"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:802
-msgid "Job status: Canceled"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:807
-msgid "Job status: Waiting on File daemon"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:812
-msgid "Job status: Waiting on the Storage daemon"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:817
-msgid "Job status: Waiting for new media"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:822
-msgid "Job status: Waiting for Mount"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:827
-msgid "Job status: Waiting for storage resource"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:832
-msgid "Job status: Waiting for job resource"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:837
-msgid "Job status: Waiting for Client resource"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:842
-msgid "Job status: Waiting for maximum jobs"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:847
-msgid "Job status: Waiting for start time"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:852
-msgid "Job status: Waiting for higher priority jobs to finish"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:857
-#, c-format
-msgid "Unknown job status %c."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:858
-#, c-format
-msgid "Job status: Unknown(%c)"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:865
-#, c-format
-msgid "Bad scan : '%s' %d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:906
-#, c-format
-msgid "Connecting to Director %s:%d"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:912
-#, c-format
-msgid "Connecting to Client %s:%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:913
-#, c-format
-msgid "Connecting to Client %s:%d"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:919
-#, c-format
-msgid "Connecting to Storage %s:%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:920
-#, c-format
-msgid "Connecting to Storage %s:%d"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:925 src/tray-monitor/tray-monitor.c:963
-#, c-format
-msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:931
-msgid "Cannot connect to daemon.\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:932
-msgid "Cannot connect to daemon."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:944
-#, c-format
-msgid "Authentication error : %s"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:951
-msgid "Opened connection with Director daemon.\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:952
-msgid "Opened connection with Director daemon."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:955
-msgid "Opened connection with File daemon.\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:956
-msgid "Opened connection with File daemon."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:959
-msgid "Opened connection with Storage daemon.\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:960
-msgid "Opened connection with Storage daemon."
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:997
-msgid "<< Error: BNET_PROMPT signal received. >>\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:1002 src/wx-console/console_thread.cpp:486
-msgid "<< Heartbeat signal received, answered. >>\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:1006
-#, c-format
-msgid "<< Unexpected signal received : %s >>\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:1011
-msgid "<ERROR>\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:1015
-msgid "Error : BNET_HARDEOF or BNET_ERROR"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:1021
-msgid "<STOP>\n"
-msgstr ""
-
-#: src/tray-monitor/tray-monitor.c:1025
-msgid "Error : Connection closed."
-msgstr ""
-
-#: src/tray-monitor/tray_conf.c:177
-#, c-format
-msgid "Monitor: name=%s FDtimeout=%s SDtimeout=%s\n"
-msgstr ""
-
-#: src/tray-monitor/tray_conf.c:183
-#, c-format
-msgid "Director: name=%s address=%s FDport=%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray_conf.c:187
-#, c-format
-msgid "Client: name=%s address=%s FDport=%d\n"
-msgstr ""
-
-#: src/tray-monitor/tray_conf.c:191
-#, c-format
-msgid "Storage: name=%s address=%s SDport=%d\n"
-msgstr ""
-
-#: src/wx-console/authenticate.c:150
-msgid "Bad response to Hello command: ERR="
-msgstr ""
-
-#: src/baconfig.h:72
-#, c-format
-msgid "Failed ASSERT: %s\n"
-msgstr ""
-
-#: src/baconfig.h:79
-msgid "*None*"
-msgstr ""
-
-#: src/win32/dird/winmain.cpp:193 src/win32/dird/winmain.cpp:200
-#: src/win32/filed/winmain.cpp:224 src/win32/filed/winmain.cpp:231
-#: src/win32/stored/baculasd/winmain.cpp:225
-#: src/win32/stored/baculasd/winmain.cpp:232
-msgid "Bacula Usage"
-msgstr ""
-
-#: src/win32/dird/winmain.cpp:197 src/win32/filed/winmain.cpp:228
-#: src/win32/stored/baculasd/winmain.cpp:229
-msgid "Bad Command Line Options"
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:119 src/win32/filed/winservice.cpp:238
-#: src/win32/stored/baculasd/winservice.cpp:169
-msgid "StartServiceCtrlDispatcher failed."
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:135 src/win32/filed/winservice.cpp:256
-#: src/win32/stored/baculasd/winservice.cpp:185
-msgid "RegisterServiceCtlHandler failed"
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:136 src/win32/filed/winservice.cpp:257
-#: src/win32/stored/baculasd/winservice.cpp:186
-msgid "Contact Register Service Handler failure"
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:152 src/win32/filed/winservice.cpp:273
-#: src/win32/stored/baculasd/winservice.cpp:202
-msgid "ReportStatus STOPPED failed 1"
-msgstr ""
-
-#: src/win32/dird/winservice.cpp:175 src/win32/filed/winservice.cpp:296
-#: src/win32/stored/baculasd/winservice.cpp:225
-msgid "Report Service failure"
+#: src/win32/dird/winservice.cpp:175 src/win32/filed/winservice.cpp:296
+#: src/win32/stored/baculasd/winservice.cpp:225
+msgid "Report Service failure"
 msgstr ""
 
 #: src/win32/dird/winservice.cpp:211
@@ -15221,710 +14402,3 @@ msgstr ""
 msgid ""
 "The SCM could not be contacted - the Bacula Storage service was not removed"
 msgstr ""
-
-#: src/wx-console/console_thread.cpp:121
-#, c-format
-msgid ""
-"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
-"Director \"%s\" in config file.\n"
-"At least one CA certificate store is required.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:128
-msgid ""
-"No Director resource defined in config file.\n"
-"Without that I don't how to speak to the Director :-(\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:147
-#, c-format
-msgid ""
-"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
-"Console \"%s\" in config file.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:169
-msgid "Error while initializing windows sockets...\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:185
-msgid "Error while cleaning up windows sockets...\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:224
-msgid "Error while initializing library."
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:248
-msgid "Cryptographic library initialization failed.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:252
-msgid "Please correct configuration file.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:294
-msgid "Error : Library not initialized\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:305
-msgid "Error : No configuration file loaded\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:315
-msgid "Connecting...\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:331
-msgid "Error : No director defined in config file.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:343
-msgid "Multiple directors found in your config file.\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:352
-#, c-format
-msgid "Please choose a director (1-%d): "
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:424
-msgid "Failed to connect to the director\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:434
-msgid "Connected\n"
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:491
-msgid "<< Unexpected signal received : "
-msgstr ""
-
-#: src/wx-console/console_thread.cpp:511
-msgid "Connection terminated\n"
-msgstr ""
-
-#: src/wx-console/main.cpp:119
-msgid "Bacula bwx-console"
-msgstr ""
-
-#: src/wx-console/main.cpp:124 src/wx-console/wxbmainframe.cpp:267
-#, c-format
-msgid "Welcome to bacula bwx-console %s (%s)!\n"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:65
-msgid "Config file editor"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:75
-msgid "# Bacula bwx-console Configuration File\n"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:111
-msgid "Save and close"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:112
-msgid "Close without saving"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:139
-#, c-format
-msgid "Unable to write to %s\n"
-msgstr ""
-
-#: src/wx-console/wxbconfigfileeditor.cpp:140
-msgid "Error while saving"
-msgstr ""
-
-#: src/wx-console/wxbconfigpanel.cpp:205
-msgid "Apply"
-msgstr ""
-
-#: src/wx-console/wxbhistorytextctrl.cpp:82
-#: src/wx-console/wxbhistorytextctrl.cpp:153
-#: src/wx-console/wxbmainframe.cpp:291
-msgid "Type your command below:"
-msgstr ""
-
-#: src/wx-console/wxbhistorytextctrl.cpp:117
-msgid "Unknown command."
-msgstr ""
-
-#: src/wx-console/wxbhistorytextctrl.cpp:126
-msgid "Possible completions: "
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:246
-msgid "&About...\tF1"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:246
-msgid "Show about dialog"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:248 src/wx-console/wxbmainframe.cpp:620
-msgid "Connect to the director"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:249
-msgid "Disconnect"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:249
-msgid "Disconnect of the director"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:251
-msgid "Change of configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:251
-msgid "Change your default configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:252
-msgid "Edit your configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:254
-msgid "E&xit\tAlt-X"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:254
-msgid "Quit this program"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:258
-msgid "&File"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:259
-msgid "&Help"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:283
-msgid ""
-"Warning : Unicode is disabled because you are using wxWidgets for GTK+ 1.2.\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:287
-msgid ""
-"Warning : There is a problem with wxWidgets for GTK+ 2.0 without Unicode "
-"support when handling non-ASCII filenames: Every non-ASCII character in such "
-"filenames will be replaced by an interrogation mark.\n"
-"If this behaviour disturbs you, please build bwx-console against a Unicode "
-"version of wxWidgets for GTK+ 2.0.\n"
-"---\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:298
-msgid "Send"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:375 src/wx-console/wxbmainframe.cpp:387
-msgid "Error while parsing command line arguments, using defaults.\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:376 src/wx-console/wxbmainframe.cpp:388
-msgid "Usage: bwx-console [-c configfile] [-w tmp]\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:417
-#, c-format
-msgid ""
-"It seems that it is the first time you run bwx-console.\n"
-"This file (%s) has been choosen as default configuration file.\n"
-"Do you want to edit it? (if you click No you will have to select another "
-"file)"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:419
-msgid "First run"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:436
-#, c-format
-msgid ""
-"Unable to read %s\n"
-"Error: %s\n"
-"Do you want to choose another one? (Press no to edit this file)"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:438
-msgid "Unable to read configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:450
-msgid "Please choose a configuration file to use"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:463
-msgid "This configuration file has been successfully read, use it as default?"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:464
-msgid "Configuration file read successfully"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:474
-#, c-format
-msgid "Using this configuration file: %s\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:479
-msgid "Connecting to the director..."
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:494
-msgid "Failed to unregister a data parser !"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:502
-msgid "Quitting.\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:517
-msgid ""
-"Welcome to Bacula bwx-console.\n"
-"Written by Nicolas Boichat <nicolas@boichat.ch>\n"
-"Copyright (C), 2005-2007 Free Software Foundation Europe, e.V.\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:521
-msgid "About Bacula bwx-console"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:527
-msgid "Please choose your default configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:531
-msgid "Use this configuration file as default?"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:532
-msgid "Configuration file"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:603
-msgid "Console thread terminated."
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:611
-msgid "Connection to the director lost. Quit program?"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:612
-msgid "Connection lost"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:628
-msgid "Connected to the director."
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:651
-msgid "Reconnect"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:652
-msgid "Reconnect to the director"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:666
-msgid "Disconnected of the director."
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:685 src/wx-console/wxbrestorepanel.cpp:710
-msgid "Unexpected question has been received.\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:708 src/wx-console/wxbmainframe.cpp:725
-msgid "bwx-console: unexpected director's question."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:234
-#: src/wx-console/wxbrestorepanel.cpp:1920
-#: src/wx-console/wxbrestorepanel.cpp:1949
-msgid "Enter restore mode"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:237
-msgid "Cancel restore"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:263
-#: src/wx-console/wxbrestorepanel.cpp:317
-msgid "Add"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:265
-#: src/wx-console/wxbrestorepanel.cpp:319
-msgid "Remove"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:267
-#: src/wx-console/wxbrestorepanel.cpp:321
-msgid "Refresh"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:286
-msgid "M"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:290
-msgid "Filename"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:302
-msgid "Perm."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:335
-#: src/wx-console/wxbrestorepanel.cpp:348
-#: src/wx-console/wxbrestorepanel.cpp:503
-#: src/wx-console/wxbrestorepanel.cpp:513
-#: src/wx-console/wxbrestorepanel.cpp:516
-#: src/wx-console/wxbrestorepanel.cpp:1784
-#: src/wx-console/wxbrestorepanel.cpp:1870
-msgid "Job Name"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:337
-#: src/wx-console/wxbrestorepanel.cpp:353
-#: src/wx-console/wxbrestorepanel.cpp:455
-#: src/wx-console/wxbrestorepanel.cpp:456
-#: src/wx-console/wxbrestorepanel.cpp:466
-#: src/wx-console/wxbrestorepanel.cpp:467
-#: src/wx-console/wxbrestorepanel.cpp:1139
-#: src/wx-console/wxbrestorepanel.cpp:1212
-#: src/wx-console/wxbrestorepanel.cpp:1822
-#: src/wx-console/wxbrestorepanel.cpp:1824
-#: src/wx-console/wxbrestorepanel.cpp:1885
-msgid "Fileset"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:340
-#: src/wx-console/wxbrestorepanel.cpp:1206
-#: src/wx-console/wxbrestorepanel.cpp:1222
-#: src/wx-console/wxbrestorepanel.cpp:1224
-#: src/wx-console/wxbrestorepanel.cpp:1232
-#: src/wx-console/wxbrestorepanel.cpp:1234
-#: src/wx-console/wxbrestorepanel.cpp:1253
-#: src/wx-console/wxbrestorepanel.cpp:1260
-#: src/wx-console/wxbrestorepanel.cpp:1812
-#: src/wx-console/wxbrestorepanel.cpp:1823
-#: src/wx-console/wxbrestorepanel.cpp:1944
-msgid "Before"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:342
-msgid "Please configure parameters concerning files to restore :"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-#: src/wx-console/wxbrestorepanel.cpp:1878
-msgid "always"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-msgid "if newer"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-msgid "if older"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-#: src/wx-console/wxbrestorepanel.cpp:1881
-msgid "never"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:359
-msgid "Please configure parameters concerning files restoration :"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:427
-msgid "Getting parameters list."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:435
-msgid "Error : no clients returned by the director."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:459
-msgid "Error : no filesets returned by the director."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:483
-msgid "Error : no storage returned by the director."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:506
-#: src/wx-console/wxbrestorepanel.cpp:530
-msgid "Error : no jobs returned by the director."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:516
-msgid "RestoreFiles"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:551
-msgid "Please configure your restore parameters."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:562
-msgid "Building restore tree..."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:605
-msgid "Error while starting restore: "
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:695
-msgid ""
-"Right click on a file or on a directory, or double-click on its mark to add "
-"it to the restore list."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:732
-#: src/wx-console/wxbrestorepanel.cpp:754
-msgid "bwx-console: unexpected restore question."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:765
-msgid " files selected to be restored."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:770
-msgid " file selected to be restored."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:777
-#, c-format
-msgid "Please configure your restore (%ld files selected to be restored)..."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:787
-msgid "Restore failed : no file selected.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:788
-msgid "Restore failed : no file selected."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:798
-msgid "Restoring, please wait..."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:811
-msgid "Job queued. JobId="
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:813
-msgid "Restore queued, jobid="
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:817
-msgid "Job failed."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:818
-msgid "Restore failed, please look at messages.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:819
-msgid "Restore failed, please look at messages in console."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:825
-#: src/wx-console/wxbrestorepanel.cpp:826
-msgid "Failed to retrieve jobid.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:852
-msgid ""
-"Restore is scheduled in more than two minutes, bwx-console will not wait for "
-"its completion.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:853
-msgid ""
-"Restore is scheduled in more than two minutes, bwx-console will not wait for "
-"its completion."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:879
-msgid "Restore job created, but not yet running."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:884
-#, c-format
-msgid "Restore job running, please wait (%ld of %ld files restored)..."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:888
-msgid "Restore job terminated successfully."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:889
-msgid "Restore job terminated successfully.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:894
-msgid "Restore job terminated in error, see messages in console."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:895
-msgid "Restore job terminated in error, see messages.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:900
-msgid "Restore job reported a non-fatal error."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:904
-msgid "Restore job reported a fatal error."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:909
-msgid "Restore job cancelled by user."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:910
-msgid "Restore job cancelled by user.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:915
-msgid "Restore job is waiting on File daemon."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:919
-msgid "Restore job is waiting for new media."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:923
-msgid "Restore job is waiting for storage resource."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:927
-msgid "Restore job is waiting for job resource."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:931
-msgid "Restore job is waiting for Client resource."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:935
-msgid "Restore job is waiting for maximum jobs."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:939
-msgid "Restore job is waiting for start time."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:943
-msgid "Restore job is waiting for higher priority jobs to finish."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:992
-msgid ""
-"The restore job has not been started within one minute, bwx-console will not "
-"wait for its completion anymore.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:993
-msgid ""
-"The restore job has not been started within one minute, bwx-console will not "
-"wait for its completion anymore."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1003
-msgid "Restore done successfully.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1004
-msgid "Restore done successfully."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1075
-msgid "Applying restore configuration changes..."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1126
-msgid "Failed to find the selected client."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1141
-msgid "Failed to find the selected fileset."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1156
-msgid "Failed to find the selected storage."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1173
-#: src/wx-console/wxbrestorepanel.cpp:1859
-msgid "Run Restore job"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1189
-msgid "Restore configuration changes were applied."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1198
-msgid "Restore cancelled.\n"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1199
-msgid "Restore cancelled."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1221
-msgid "No results to list."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1223
-msgid "No backup found for this client."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1230
-msgid "ERROR"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1231
-msgid "Query failed"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1233
-msgid "Cannot get previous backups list, see console."
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1869
-msgid "JobName:"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1873
-msgid "Where:"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1876
-msgid "Replace:"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1879
-msgid "ifnewer"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1880
-msgid "ifolder"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:1884
-msgid "FileSet:"
-msgstr ""
-
-#: src/wx-console/wxbrestorepanel.cpp:2001
-msgid "Restoring..."
-msgstr ""
diff --git a/bacula/po/nl.po b/bacula/po/nl.po
index da4c531..e422b55 100644
--- a/bacula/po/nl.po
+++ b/bacula/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Bacula 5.2.7\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2014-03-23 22:51+0100\n"
+"POT-Creation-Date: 2014-03-30 20:55+0200\n"
 "PO-Revision-Date: 2012-05-05 11:52+0100\n"
 "Last-Translator: W. van den Akker <wvdakker@wilsoft.nl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,7 +53,7 @@ msgid ""
 "Please see "
 msgstr ""
 
-#: src/console/console_conf.c:128 src/qt-console/bat_conf.cpp:129
+#: src/console/console_conf.c:128 src/qt-console/bat_conf.cpp:130
 #, c-format
 msgid "No record for %d %s\n"
 msgstr ""
@@ -63,33 +63,33 @@ msgstr ""
 msgid "Console: name=%s rcfile=%s histfile=%s\n"
 msgstr ""
 
-#: src/console/console_conf.c:141 src/qt-console/bat_conf.cpp:138
+#: src/console/console_conf.c:141 src/qt-console/bat_conf.cpp:139
 #, c-format
 msgid "Director: name=%s address=%s DIRport=%d\n"
 msgstr ""
 
-#: src/console/console_conf.c:145 src/console/console_conf.c:221
-#: src/console/console_conf.c:266 src/console/console_conf.c:293
+#: src/console/console_conf.c:145 src/console/console_conf.c:224
+#: src/console/console_conf.c:269 src/console/console_conf.c:296
 #: src/stored/stored_conf.c:538 src/stored/stored_conf.c:628
 #: src/stored/stored_conf.c:663 src/filed/filed_conf.c:411
 #: src/filed/filed_conf.c:476 src/filed/filed_conf.c:506
-#: src/qt-console/bat_conf.cpp:149 src/qt-console/bat_conf.cpp:227
-#: src/qt-console/bat_conf.cpp:275 src/qt-console/bat_conf.cpp:305
+#: src/qt-console/bat_conf.cpp:150 src/qt-console/bat_conf.cpp:231
+#: src/qt-console/bat_conf.cpp:279 src/qt-console/bat_conf.cpp:309
 #, c-format
 msgid "Unknown resource type %d\n"
 msgstr ""
 
-#: src/console/console_conf.c:247 src/dird/dird_conf.c:1425
+#: src/console/console_conf.c:250 src/dird/dird_conf.c:1425
 #: src/dird/dird_conf.c:1440 src/filed/filed_conf.c:439
 #: src/qt-console/tray-monitor/tray_conf.cpp:276
-#: src/qt-console/bat_conf.cpp:253
+#: src/qt-console/bat_conf.cpp:257
 #, c-format
 msgid "%s item is required in %s resource, but not found.\n"
 msgstr ""
 
-#: src/console/console_conf.c:310 src/dird/dird_conf.c:1664
+#: src/console/console_conf.c:313 src/dird/dird_conf.c:1664
 #: src/filed/filed_conf.c:524 src/qt-console/tray-monitor/tray_conf.cpp:360
-#: src/qt-console/bat_conf.cpp:322
+#: src/qt-console/bat_conf.cpp:326
 #, c-format
 msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
 msgstr ""
@@ -193,38 +193,38 @@ msgstr ""
 msgid "You must enter a number between 1 and %d\n"
 msgstr ""
 
-#: src/console/console.c:1095 src/stored/stored.c:215 src/dird/dird.c:267
+#: src/console/console.c:1101 src/stored/stored.c:215 src/dird/dird.c:267
 #: src/filed/filed.c:204 src/qt-console/main.cpp:154
 msgid "Cryptography library initialization failed.\n"
 msgstr ""
 
-#: src/console/console.c:1099 src/stored/stored.c:219 src/dird/dird.c:271
+#: src/console/console.c:1105 src/stored/stored.c:219 src/dird/dird.c:271
 #: src/dird/dird.c:299 src/dird/dird.c:517 src/dird/dird.c:520
 #: src/filed/filed.c:209 src/qt-console/main.cpp:158
 #, c-format
 msgid "Please correct configuration file: %s\n"
 msgstr ""
 
-#: src/console/console.c:1129
+#: src/console/console.c:1136
 #, c-format
 msgid "Connecting to Director %s:%d\n"
 msgstr ""
 
-#: src/console/console.c:1146 src/qt-console/bcomm/dircomm.cpp:118
+#: src/console/console.c:1153 src/qt-console/bcomm/dircomm.cpp:150
 #, c-format
 msgid "Failed to initialize TLS context for Console \"%s\".\n"
 msgstr ""
 
-#: src/console/console.c:1166 src/qt-console/bcomm/dircomm.cpp:141
+#: src/console/console.c:1173 src/qt-console/bcomm/dircomm.cpp:173
 #, c-format
 msgid "Failed to initialize TLS context for Director \"%s\".\n"
 msgstr ""
 
-#: src/console/console.c:1198
+#: src/console/console.c:1205
 msgid "Enter a period to cancel a command.\n"
 msgstr ""
 
-#: src/console/console.c:1284 src/console/console.c:1314
+#: src/console/console.c:1291 src/console/console.c:1321
 #: src/stored/stored.c:342 src/dird/dird.c:607 src/dird/dird.c:813
 #: src/dird/dird.c:868 src/dird/dird.c:907 src/filed/filed.c:366
 #: src/filed/filed.c:566 src/qt-console/main.cpp:213
@@ -232,59 +232,59 @@ msgstr ""
 msgid "TLS required but not configured in Bacula.\n"
 msgstr ""
 
-#: src/console/console.c:1292 src/qt-console/main.cpp:221
+#: src/console/console.c:1299 src/qt-console/main.cpp:221
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Director \"%s\" in %s. At least one CA certificate store is required.\n"
 msgstr ""
 
-#: src/console/console.c:1301 src/qt-console/main.cpp:230
+#: src/console/console.c:1308 src/qt-console/main.cpp:230
 #, c-format
 msgid ""
 "No Director resource defined in %s\n"
 "Without that I don't how to speak to the Director :-(\n"
 msgstr ""
 
-#: src/console/console.c:1321 src/qt-console/main.cpp:251
+#: src/console/console.c:1328 src/qt-console/main.cpp:251
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Console \"%s\" in %s.\n"
 msgstr ""
 
-#: src/console/console.c:1347
+#: src/console/console.c:1354
 msgid "Too many arguments on input command.\n"
 msgstr ""
 
-#: src/console/console.c:1351
+#: src/console/console.c:1358
 msgid "First argument to input command must be a filename.\n"
 msgstr ""
 
-#: src/console/console.c:1357
+#: src/console/console.c:1364
 #, c-format
 msgid "Cannot open file %s for input. ERR=%s\n"
 msgstr ""
 
-#: src/console/console.c:1389
+#: src/console/console.c:1396
 msgid "Too many arguments on output/tee command.\n"
 msgstr ""
 
-#: src/console/console.c:1406
+#: src/console/console.c:1413
 #, c-format
 msgid "Cannot open file %s for output. ERR=%s\n"
 msgstr ""
 
-#: src/console/console.c:1425
+#: src/console/console.c:1432
 msgid "Too many arguments. Enclose command in double quotes.\n"
 msgstr ""
 
-#: src/console/console.c:1434
+#: src/console/console.c:1441
 #, c-format
 msgid "Cannot popen(\"%s\", \"r\"): ERR=%s\n"
 msgstr ""
 
-#: src/console/console.c:1446 src/stored/autochanger.c:665
+#: src/console/console.c:1453 src/stored/autochanger.c:665
 #, c-format
 msgid "Autochanger error: ERR=%s\n"
 msgstr ""
@@ -4131,7 +4131,7 @@ msgid "Bad storage command: %s"
 msgstr ""
 
 #: src/stored/dircmd.c:377 src/dird/msgchan.c:121 src/filed/job.c:1880
-#: src/qt-console/tray-monitor/tray-monitor.cpp:363
+#: src/qt-console/tray-monitor/tray-monitor.cpp:372
 msgid "Storage daemon"
 msgstr ""
 
@@ -5007,17 +5007,17 @@ msgstr ""
 msgid "Cannot free Volume \"%s\", because it is reserved by someone else.\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:512
+#: src/stored/vol_mgr.c:514
 #, c-format
 msgid "Volume %s is busy swapping from %s to %s\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:515
+#: src/stored/vol_mgr.c:517
 #, c-format
 msgid "Volume %s is busy swapping.\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:519
+#: src/stored/vol_mgr.c:521
 #, c-format
 msgid "%s device %s is busy.\n"
 msgstr ""
@@ -6605,30 +6605,30 @@ msgstr ""
 msgid "NULL jcr.\n"
 msgstr ""
 
-#: src/lib/jcr.c:496
+#: src/lib/jcr.c:495
 #, c-format
 msgid "JCR use_count=%d JobId=%d\n"
 msgstr ""
 
-#: src/lib/jcr.c:601
+#: src/lib/jcr.c:600
 #, c-format
 msgid "pthread_setspecific failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/jcr.c:1082
+#: src/lib/jcr.c:1081
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Storage "
 "daemon.\n"
 msgstr ""
 
-#: src/lib/jcr.c:1094
+#: src/lib/jcr.c:1093
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading File daemon.\n"
 msgstr ""
 
-#: src/lib/jcr.c:1106
+#: src/lib/jcr.c:1105
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Director.\n"
@@ -6657,98 +6657,98 @@ msgstr ""
 msgid "Close of NULL file\n"
 msgstr ""
 
-#: src/lib/lex.c:212
+#: src/lib/lex.c:215
 msgid ""
 "get_char: called after EOF. You may have a open double quote without the "
 "closing double quote.\n"
 msgstr ""
 
-#: src/lib/lex.c:254
+#: src/lib/lex.c:257
 #, c-format
 msgid "Config token too long, file: %s, line %d, begins at line %d\n"
 msgstr ""
 
-#: src/lib/lex.c:278
+#: src/lib/lex.c:281
 msgid "none"
 msgstr ""
 
-#: src/lib/lex.c:279
+#: src/lib/lex.c:282
 msgid "comment"
 msgstr ""
 
-#: src/lib/lex.c:280
+#: src/lib/lex.c:283
 msgid "number"
 msgstr ""
 
-#: src/lib/lex.c:281
+#: src/lib/lex.c:284
 msgid "ip_addr"
 msgstr ""
 
-#: src/lib/lex.c:282
+#: src/lib/lex.c:285
 msgid "identifier"
 msgstr ""
 
-#: src/lib/lex.c:283
+#: src/lib/lex.c:286
 msgid "string"
 msgstr ""
 
-#: src/lib/lex.c:284
+#: src/lib/lex.c:287
 msgid "quoted_string"
 msgstr ""
 
-#: src/lib/lex.c:285
+#: src/lib/lex.c:288
 msgid "include"
 msgstr ""
 
-#: src/lib/lex.c:286
+#: src/lib/lex.c:289
 msgid "include_quoted_string"
 msgstr ""
 
-#: src/lib/lex.c:287
+#: src/lib/lex.c:290
 msgid "UTF-8 Byte Order Mark"
 msgstr ""
 
-#: src/lib/lex.c:288
+#: src/lib/lex.c:291
 msgid "UTF-16le Byte Order Mark"
 msgstr ""
 
-#: src/lib/lex.c:326 src/lib/lex.c:332 src/lib/lex.c:343 src/lib/lex.c:349
+#: src/lib/lex.c:329 src/lib/lex.c:335 src/lib/lex.c:346 src/lib/lex.c:352
 #, c-format
 msgid "expected a positive integer number, got: %s"
 msgstr ""
 
-#: src/lib/lex.c:465
+#: src/lib/lex.c:468
 msgid ""
 "This config file appears to be in an unsupported Unicode format (UTF-16be). "
 "Please resave as UTF-8\n"
 msgstr ""
 
-#: src/lib/lex.c:611 src/lib/lex.c:639
+#: src/lib/lex.c:614 src/lib/lex.c:642
 #, c-format
 msgid "Cannot open included config file %s: %s\n"
 msgstr ""
 
-#: src/lib/lex.c:698 src/lib/lex.c:755
+#: src/lib/lex.c:701 src/lib/lex.c:758
 #, c-format
 msgid "expected an integer or a range, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:712 src/lib/lex.c:720 src/lib/lex.c:731 src/lib/lex.c:739
+#: src/lib/lex.c:715 src/lib/lex.c:723 src/lib/lex.c:734 src/lib/lex.c:742
 #, c-format
 msgid "expected an integer number, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:769
+#: src/lib/lex.c:772
 #, c-format
 msgid "expected a name, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:773
+#: src/lib/lex.c:776
 #, c-format
 msgid "name %s length %d too long, max is %d\n"
 msgstr ""
 
-#: src/lib/lex.c:781
+#: src/lib/lex.c:784
 #, c-format
 msgid "expected a string, got %s: %s"
 msgstr ""
@@ -8326,8 +8326,7 @@ msgstr ""
 msgid "Could not add job queue: ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:121 src/dird/ua_output.c:714 src/dird/xua_output.c:869
-#: src/tools/cats_test.c:363
+#: src/dird/job.c:121 src/dird/ua_output.c:714 src/tools/cats_test.c:363
 #, c-format
 msgid "Could not open database \"%s\".\n"
 msgstr ""
@@ -8621,16 +8620,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/ua_output.c:57 src/dird/ua_output.c:81 src/dird/xua_output.c:56
-#: src/dird/xua_output.c:80
+#: src/dird/ua_output.c:57 src/dird/ua_output.c:81
 msgid "ON or OFF keyword missing.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:101 src/dird/xua_output.c:100
+#: src/dird/ua_output.c:101
 msgid "Disabled Jobs:\n"
 msgstr ""
 
-#: src/dird/ua_output.c:107 src/dird/xua_output.c:106
+#: src/dird/ua_output.c:107
 msgid "No disabled Jobs.\n"
 msgstr ""
 
@@ -8638,94 +8636,93 @@ msgstr ""
 msgid "disabled"
 msgstr ""
 
-#: src/dird/ua_output.c:199 src/dird/xua_output.c:204
+#: src/dird/ua_output.c:199
 msgid "Keywords for the show command are:\n"
 msgstr ""
 
-#: src/dird/ua_output.c:205 src/dird/xua_output.c:211
+#: src/dird/ua_output.c:205
 #, c-format
 msgid "%s resource %s not found.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:208 src/dird/xua_output.c:215
+#: src/dird/ua_output.c:208
 #, c-format
 msgid "Resource %s not found\n"
 msgstr ""
 
-#: src/dird/ua_output.c:278 src/dird/xua_output.c:356
+#: src/dird/ua_output.c:278
 msgid "Hey! DB is NULL\n"
 msgstr ""
 
-#: src/dird/ua_output.c:435 src/dird/xua_output.c:590
+#: src/dird/ua_output.c:435
 #, c-format
 msgid "Jobid %d used %d Volume(s): %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:454 src/dird/xua_output.c:609
+#: src/dird/ua_output.c:454
 msgid "No Pool specified.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:465 src/dird/ua_select.c:531 src/dird/xua_output.c:620
-#: src/dird/ua_update.c:424
+#: src/dird/ua_output.c:465 src/dird/ua_select.c:531 src/dird/ua_update.c:424
 #, c-format
 msgid "Error obtaining pool ids. ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:475 src/dird/xua_output.c:630
+#: src/dird/ua_output.c:475
 #, c-format
 msgid "Pool: %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:491 src/dird/xua_output.c:646
+#: src/dird/ua_output.c:491
 msgid "Ignoring invalid value for days. Max is 50.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:513 src/dird/xua_output.c:668
+#: src/dird/ua_output.c:513
 #, c-format
 msgid "Unknown list keyword: %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:538 src/dird/xua_output.c:693
+#: src/dird/ua_output.c:538
 #, c-format
 msgid "%s is not a job name.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:552 src/dird/xua_output.c:707
+#: src/dird/ua_output.c:552
 #, c-format
 msgid "Could not find Pool for Job %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:565 src/dird/xua_output.c:720
+#: src/dird/ua_output.c:565
 #, c-format
 msgid "Could not find next Volume for Job %s (Pool=%s, Level=%s).\n"
 msgstr ""
 
-#: src/dird/ua_output.c:569 src/dird/xua_output.c:724
+#: src/dird/ua_output.c:569
 #, c-format
 msgid ""
 "The next Volume to be used by Job \"%s\" (Pool=%s, Level=%s) will be %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:582 src/dird/xua_output.c:737
+#: src/dird/ua_output.c:582
 #, c-format
 msgid "Could not find next Volume for Job %s.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:727 src/dird/xua_output.c:882
+#: src/dird/ua_output.c:727
 #, c-format
 msgid "Pool %s not in database. %s"
 msgstr ""
 
-#: src/dird/ua_output.c:735 src/dird/xua_output.c:890
+#: src/dird/ua_output.c:735
 #, c-format
 msgid "Pool %s created in database.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:788 src/dird/xua_output.c:943
+#: src/dird/ua_output.c:788
 msgid "You have no messages.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:868 src/dird/xua_output.c:1023
+#: src/dird/ua_output.c:868
 msgid "Message too long to display.\n"
 msgstr ""
 
@@ -12732,19 +12729,6 @@ msgstr ""
 msgid "Director's connection to SD for this Job was lost.\n"
 msgstr ""
 
-#: src/dird/xua_output.c:518
-msgid "Invalid jobid argument\n"
-msgstr ""
-
-#: src/dird/xua_output.c:542
-#, c-format
-msgid "Unknown ObjectType %s\n"
-msgstr ""
-
-#: src/dird/xua_output.c:552
-msgid "list pluginrestoreconf requires jobid argument\n"
-msgstr ""
-
 #: src/dird/getmsg.c:160
 #, c-format
 msgid "bget_dirmsg: unknown bnet signal %d\n"
@@ -16715,7 +16699,7 @@ msgstr ""
 msgid "DROP-Stmt went wrong\n"
 msgstr ""
 
-#: examples/nagios/check_bacula/check_bacula.c:59
+#: examples/nagios/check_bacula/check_bacula.c:57
 #, c-format
 msgid ""
 "Copyright (C) 2005 Christian Masopust\n"
@@ -16737,18 +16721,18 @@ msgstr ""
 msgid "Failed ASSERT: %s\n"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:79
+#: src/qt-console/bcomm/dircomm.cpp:85
 #, c-format
 msgid "Already connected\"%s\".\n"
 msgstr "Al verbonden\"%s\".\n"
 
-#: src/qt-console/bcomm/dircomm.cpp:90
+#: src/qt-console/bcomm/dircomm.cpp:96
 #: src/qt-console/tray-monitor/tray-monitor.cpp:347
 #, c-format
 msgid "Connecting to Director %s:%d"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:92
+#: src/qt-console/bcomm/dircomm.cpp:98
 #, c-format
 msgid ""
 "Connecting to Director %s:%d\n"
@@ -16757,40 +16741,40 @@ msgstr ""
 "Verbinden met Director %s:%d\n"
 "\n"
 
-#: src/qt-console/bcomm/dircomm.cpp:163
-#: src/qt-console/tray-monitor/tray-monitor.cpp:349
+#: src/qt-console/bcomm/dircomm.cpp:195
+#: src/qt-console/tray-monitor/tray-monitor.cpp:352
 msgid "Director daemon"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:201
+#: src/qt-console/bcomm/dircomm.cpp:233
 msgid "Initializing ..."
 msgstr "Initialiseren ..."
 
-#: src/qt-console/bcomm/dircomm.cpp:217 src/qt-console/console/console.cpp:130
+#: src/qt-console/bcomm/dircomm.cpp:249 src/qt-console/console/console.cpp:130
 msgid "Connected"
 msgstr "Verbonden"
 
-#: src/qt-console/bcomm/dircomm.cpp:341
+#: src/qt-console/bcomm/dircomm.cpp:373
 msgid "Command completed ..."
 msgstr "Opdracht gereed ..."
 
-#: src/qt-console/bcomm/dircomm.cpp:348 src/qt-console/console/console.cpp:367
+#: src/qt-console/bcomm/dircomm.cpp:380 src/qt-console/console/console.cpp:367
 msgid "Processing command ..."
 msgstr "Opdracht aan het uitvoeren ..."
 
-#: src/qt-console/bcomm/dircomm.cpp:355
+#: src/qt-console/bcomm/dircomm.cpp:387
 msgid "At main prompt waiting for input ..."
 msgstr "Wacht op invoer op opdrachtregel in hoofdscherm ..."
 
-#: src/qt-console/bcomm/dircomm.cpp:362 src/qt-console/bcomm/dircomm.cpp:375
+#: src/qt-console/bcomm/dircomm.cpp:394 src/qt-console/bcomm/dircomm.cpp:407
 msgid "At prompt waiting for input ..."
 msgstr "Wacht op invoer op opdrachtregel ..."
 
-#: src/qt-console/bcomm/dircomm.cpp:383
+#: src/qt-console/bcomm/dircomm.cpp:415
 msgid "Command failed."
 msgstr "Opdracht mislukt."
 
-#: src/qt-console/bcomm/dircomm.cpp:455
+#: src/qt-console/bcomm/dircomm.cpp:487
 msgid "Director disconnected."
 msgstr "Director niet verbonden."
 
@@ -16815,7 +16799,7 @@ msgid "Storage: name=%s address=%s SDport=%d\n"
 msgstr ""
 
 #: src/qt-console/tray-monitor/tray_conf.cpp:183
-#: src/qt-console/bat_conf.cpp:145
+#: src/qt-console/bat_conf.cpp:146
 #, c-format
 msgid "ConsoleFont: name=%s font face=%s\n"
 msgstr ""
@@ -16873,52 +16857,52 @@ msgstr ""
 msgid "Error, currentitem is not a Client or a Storage..\n"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:354
+#: src/qt-console/tray-monitor/tray-monitor.cpp:357
 #, c-format
 msgid "Connecting to Client %s:%d"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:356
+#: src/qt-console/tray-monitor/tray-monitor.cpp:362
 msgid "File daemon"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:361
+#: src/qt-console/tray-monitor/tray-monitor.cpp:367
 #, c-format
 msgid "Connecting to Storage %s:%d"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:367
-#: src/qt-console/tray-monitor/tray-monitor.cpp:397
+#: src/qt-console/tray-monitor/tray-monitor.cpp:376
+#: src/qt-console/tray-monitor/tray-monitor.cpp:406
 #, c-format
 msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:372
+#: src/qt-console/tray-monitor/tray-monitor.cpp:381
 msgid "Cannot connect to daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:381
+#: src/qt-console/tray-monitor/tray-monitor.cpp:390
 #, c-format
 msgid "Authentication error : %s"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:388
+#: src/qt-console/tray-monitor/tray-monitor.cpp:397
 msgid "Opened connection with Director daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:391
+#: src/qt-console/tray-monitor/tray-monitor.cpp:400
 msgid "Opened connection with File daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:394
+#: src/qt-console/tray-monitor/tray-monitor.cpp:403
 msgid "Opened connection with Storage daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:445
+#: src/qt-console/tray-monitor/tray-monitor.cpp:454
 msgid "Error : BNET_HARDEOF or BNET_ERROR"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:454
+#: src/qt-console/tray-monitor/tray-monitor.cpp:463
 msgid "Error : Connection closed."
 msgstr ""
 
@@ -16977,7 +16961,7 @@ msgstr ""
 "       -?            geef deze melding.\n"
 "\n"
 
-#: src/qt-console/bat_conf.cpp:142
+#: src/qt-console/bat_conf.cpp:143
 #, c-format
 msgid "Console: name=%s\n"
 msgstr "Console: naam=%s\n"
@@ -17046,10 +17030,6 @@ msgstr "Console: naam=%s\n"
 #~ msgid "Config file editor"
 #~ msgstr "Configuratiebestand"
 
-#, fuzzy
-#~ msgid "# Bacula bwx-console Configuration File\n"
-#~ msgstr "Corrigeer configuratie bestand aub.\n"
-
 #~ msgid "Save and close"
 #~ msgstr "Opslaan en afsluiten"
 
@@ -17149,10 +17129,6 @@ msgstr "Console: naam=%s\n"
 #~ msgstr "<< Onverwacht signaal ontvangen : "
 
 #, fuzzy
-#~ msgid "bwx-console: unexpected restore question."
-#~ msgstr "bwx-console: onverwachte director's opdracht"
-
-#, fuzzy
 #~ msgid " files selected to be restored."
 #~ msgstr "Geen Volumes gevonden om terug te zetten.\n"
 
@@ -17297,13 +17273,6 @@ msgstr "Console: naam=%s\n"
 #~ msgid "Unknown command."
 #~ msgstr "Onbekende opdracht."
 
-#, fuzzy
-#~ msgid "Bacula bwx-console"
-#~ msgstr "Over Bacula bwx-console"
-
-#~ msgid "Welcome to bacula bwx-console %s (%s)!\n"
-#~ msgstr "Welkom bij het bacula bwx-console %s (%s)!\n"
-
 #~ msgid "&About...\tF1"
 #~ msgstr "&Over...\tF1"
 
@@ -17343,13 +17312,6 @@ msgstr "Console: naam=%s\n"
 #~ msgid "&Help"
 #~ msgstr "&Help"
 
-#~ msgid ""
-#~ "Warning : Unicode is disabled because you are using wxWidgets for GTK+ "
-#~ "1.2.\n"
-#~ msgstr ""
-#~ "Waarschuwing : Unicode is niet actief omdat u wxWidgets for GTK+ 1.2 "
-#~ "gebruikt.\n"
-
 #~ msgid "Send"
 #~ msgstr "Versturen"
 
@@ -17358,20 +17320,6 @@ msgstr "Console: naam=%s\n"
 #~ "Fout bij verwerken van opdrachtregel variabelen, maak nu gebruik van "
 #~ "standaard instelling.\n"
 
-#~ msgid "Usage: bwx-console [-c configfile] [-w tmp]\n"
-#~ msgstr "Specificatie: bwx-console [-c configuratiebestand] [-w tmp]\n"
-
-#~ msgid ""
-#~ "It seems that it is the first time you run bwx-console.\n"
-#~ "This file (%s) has been choosen as default configuration file.\n"
-#~ "Do you want to edit it? (if you click No you will have to select another "
-#~ "file)"
-#~ msgstr ""
-#~ "Waarschijnlijk gebruikt u bwx-console voor de eerste keer.\n"
-#~ "Dit bestand (%s) is ingesteld als uw standaard configuratiebestand.\n"
-#~ "Wilt u dit wijzigen? (Als u Nee selecteert dan moet u een ander bestand "
-#~ "selecteren)"
-
 #~ msgid "First run"
 #~ msgstr "Eerste run"
 
@@ -17409,18 +17357,6 @@ msgstr "Console: naam=%s\n"
 #~ msgid "Quitting.\n"
 #~ msgstr "Bezig met afsluiten.\n"
 
-#~ msgid ""
-#~ "Welcome to Bacula bwx-console.\n"
-#~ "Written by Nicolas Boichat <nicolas@boichat.ch>\n"
-#~ "Copyright (C), 2005-2007 Free Software Foundation Europe, e.V.\n"
-#~ msgstr ""
-#~ "Welkom bij Bacula bwx-console.\n"
-#~ "Geschreven door Nicolas Boichat <nicolas@boichat.ch>\n"
-#~ "Copyright (C), 2005-2007 Free Software Foundation Europe, e.V.\n"
-
-#~ msgid "About Bacula bwx-console"
-#~ msgstr "Over Bacula bwx-console"
-
 #~ msgid "Please choose your default configuration file"
 #~ msgstr "Kies aub uw standaard configuratiebestand"
 
@@ -17451,9 +17387,6 @@ msgstr "Console: naam=%s\n"
 #~ msgid "Disconnected of the director."
 #~ msgstr "Verbinding verbroken met director"
 
-#~ msgid "bwx-console: unexpected director's question."
-#~ msgstr "bwx-console: onverwachte director's opdracht"
-
 #, fuzzy
 #~ msgid "Unable to create component file %s. ERR=%s\n"
 #~ msgstr "Lees fout op bestand %s. FOUT=%s\n"
diff --git a/bacula/po/pl.po b/bacula/po/pl.po
index 0e30878..9031b7e 100644
--- a/bacula/po/pl.po
+++ b/bacula/po/pl.po
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/wx-console/authenticate.c:127 src/dird/authenticate.c:127
+#: src/dird/authenticate.c:127
 #: src/console/authenticate.c:125
 msgid ""
 "Authorization problem: Remote server did not advertise required TLS "
@@ -24,27 +24,22 @@ msgstr ""
 "Problem autoryzacji: Zdalny serwer nie zadeklarował wymaganego wsparcia dla "
 "TLS.\n"
 
-#: src/wx-console/authenticate.c:133 src/filed/authenticate.c:159
+#: src/filed/authenticate.c:159
 #: src/filed/authenticate.c:278 src/dird/authenticate.c:134
 #: src/console/authenticate.c:132 src/stored/authenticate.c:147
 #: src/stored/authenticate.c:258
 msgid "Authorization problem: Remote server requires TLS.\n"
 msgstr "Problem autoryzacji: Zdalny serwer wymaga TLS.\n"
 
-#: src/wx-console/authenticate.c:142 src/console/authenticate.c:141
+#: src/console/authenticate.c:141
 msgid "TLS negotiation failed\n"
 msgstr "Negocjacja TLS nie powiodła się\n"
 
-#: src/wx-console/authenticate.c:150
-msgid "Bad response to Hello command: ERR="
-msgstr "Zła odpowiedź na komend Hello: ERR="
-
-#: src/wx-console/authenticate.c:157 src/tray-monitor/authenticate.c:104
 #: src/console/authenticate.c:162
 msgid "Director rejected Hello command\n"
 msgstr "Director odrzucił komendę Hello\n"
 
-#: src/wx-console/authenticate.c:167 src/console/authenticate.c:172
+#: src/console/authenticate.c:172
 msgid ""
 "Director authorization problem.\n"
 "Most likely the passwords do not agree.\n"
@@ -60,25 +55,23 @@ msgstr ""
 "Zobacz http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi."
 "html#SECTION003760000000000000000 w celu uzyskania pomocy.\n"
 
-#: src/wx-console/console_conf.c:147 src/console/console_conf.c:140
+#: src/console/console_conf.c:140
 #: src/qt-console/bat_conf.cpp:141
 #, c-format
 msgid "No record for %d %s\n"
 msgstr "Brak rekordu dla %d %s\n"
 
-#: src/wx-console/console_conf.c:156 src/console/console_conf.c:149
+#: src/console/console_conf.c:149
 #, c-format
 msgid "Console: name=%s rcfile=%s histfile=%s\n"
 msgstr "Konsola: nazwa=%s plikrc=%s plikhist=%s\n"
 
-#: src/wx-console/console_conf.c:160 src/console/console_conf.c:153
+#: src/console/console_conf.c:153
 #: src/qt-console/bat_conf.cpp:150
 #, c-format
 msgid "Director: name=%s address=%s DIRport=%d\n"
 msgstr "Director: nazwa=%s adres=%s DIRport=%d\n"
 
-#: src/wx-console/console_conf.c:164 src/wx-console/console_conf.c:239
-#: src/wx-console/console_conf.c:284 src/wx-console/console_conf.c:311
 #: src/filed/filed_conf.c:333 src/filed/filed_conf.c:398
 #: src/filed/filed_conf.c:428 src/console/console_conf.c:157
 #: src/console/console_conf.c:233 src/console/console_conf.c:278
@@ -90,16 +83,16 @@ msgstr "Director: nazwa=%s adres=%s DIRport=%d\n"
 msgid "Unknown resource type %d\n"
 msgstr "Nieznany rodzaj zasobu %d\n"
 
-#: src/wx-console/console_conf.c:265 src/filed/filed_conf.c:361
-#: src/tray-monitor/tray_conf.c:288 src/dird/dird_conf.c:1371
+#: src/filed/filed_conf.c:361
+#: src/dird/dird_conf.c:1371
 #: src/dird/dird_conf.c:1386 src/console/console_conf.c:259
 #: src/qt-console/bat_conf.cpp:265
 #, c-format
 msgid "%s item is required in %s resource, but not found.\n"
 msgstr "Element %s jest wymagany w zasobie %s, lecz nie został znaleziony.\n"
 
-#: src/wx-console/console_conf.c:328 src/filed/filed_conf.c:446
-#: src/tray-monitor/tray_conf.c:372 src/dird/dird_conf.c:1609
+#: src/filed/filed_conf.c:446
+#: src/dird/dird_conf.c:1609
 #: src/console/console_conf.c:322 src/qt-console/bat_conf.cpp:334
 #, c-format
 msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
@@ -1084,7 +1077,7 @@ msgstr "Za komenda session: %s"
 msgid "Bad storage command: %s"
 msgstr "Za komenda storage: %s"
 
-#: src/filed/job.c:1479 src/tray-monitor/tray-monitor.c:952
+#: src/filed/job.c:1479
 #: src/dird/msgchan.c:106
 msgid "Storage daemon"
 msgstr "Demon Skadowania"
@@ -1370,13 +1363,12 @@ msgid "Diffs"
 msgstr "Rnice"
 
 #: src/filed/status.c:296 src/dird/ua_status.c:868 src/dird/ua_restore.c:430
-#: src/stored/status.c:547 src/wx-console/wxbconfigpanel.cpp:220
+#: src/stored/status.c:547
 msgid "Cancel"
 msgstr "Anulowane"
 
 #: src/filed/status.c:299 src/lib/util.c:189 src/lib/util.c:321
 #: src/dird/ua_status.c:871 src/stored/btape.c:1514 src/stored/status.c:550
-#: src/wx-console/wxbconfigpanel.cpp:209
 msgid "OK"
 msgstr "OK"
 
@@ -1639,8 +1631,8 @@ msgstr "Brak definicji zasobu Messages w %s\n"
 #: src/filed/filed.c:355 src/filed/filed.c:514 src/dird/dird.c:625
 #: src/dird/dird.c:831 src/dird/dird.c:886 src/dird/dird.c:1044
 #: src/console/console.c:1291 src/console/console.c:1321
-#: src/stored/stored.c:381 src/wx-console/console_thread.cpp:118
-#: src/wx-console/console_thread.cpp:144 src/qt-console/main.cpp:212
+#: src/stored/stored.c:381
+#: src/qt-console/main.cpp:212
 #: src/qt-console/main.cpp:242
 msgid "TLS required but not configured in Bacula.\n"
 msgstr "Wymagane TLS lecz nie zostao skonfigurowane w Baculi.\n"
@@ -1743,488 +1735,67 @@ msgstr ""
 msgid "Failed to initialize TLS context for Director \"%s\" in %s.\n"
 msgstr "Nieudana inicjalizacja kontekstu TLS dla Dyrektora \"%s\" w %s.\n"
 
-#: src/tray-monitor/tray_conf.c:168 src/dird/dird_conf.c:558
+#: src/dird/dird_conf.c:558
 #, c-format
 msgid "No %s resource defined\n"
 msgstr "Nie zdefiniowano zasobu %s\n"
 
-#: src/tray-monitor/tray_conf.c:177
-#, c-format
-msgid "Monitor: name=%s FDtimeout=%s SDtimeout=%s\n"
-msgstr "Monitor: nazwa=%s FDtimeout=%s SDtimeout=%s\n"
-
-#: src/tray-monitor/tray_conf.c:183
-#, c-format
-msgid "Director: name=%s address=%s FDport=%d\n"
-msgstr "Dyrektor: nazwa=%s adres=%s FDport=%d\n"
-
-#: src/tray-monitor/tray_conf.c:187
-#, c-format
-msgid "Client: name=%s address=%s FDport=%d\n"
-msgstr "Klient: nazwa=%s adres=%s FDport=%d\n"
-
-#: src/tray-monitor/tray_conf.c:191
-#, c-format
-msgid "Storage: name=%s address=%s SDport=%d\n"
-msgstr "Storage: nazwa=%s adres=%s SDport=%d\n"
-
-#: src/tray-monitor/tray_conf.c:195 src/qt-console/bat_conf.cpp:157
+#: src/qt-console/bat_conf.cpp:157
 #, c-format
 msgid "ConsoleFont: name=%s font face=%s\n"
 msgstr "ConsoleFont: nazwa=%s krj czcionki=%s\n"
 
-#: src/tray-monitor/tray_conf.c:199 src/dird/dird_conf.c:1008
+#: src/dird/dird_conf.c:1008
 #, c-format
 msgid "Unknown resource type %d in dump_resource.\n"
 msgstr "Nieznany typ zasobu %d w dump_resource.\n"
 
-#: src/tray-monitor/tray_conf.c:257 src/dird/dird_conf.c:1339
+#: src/dird/dird_conf.c:1339
 #, c-format
 msgid "Unknown resource type %d in free_resource.\n"
 msgstr "Nieznany typ zasobu %d w free_resource.\n"
 
-#: src/tray-monitor/tray_conf.c:294 src/lib/parse_conf.c:224
+#: src/lib/parse_conf.c:224
 #: src/dird/dird_conf.c:1377
 #, c-format
 msgid "Too many items in %s resource\n"
 msgstr "Zbyt duo elementw w zasobie %s\n"
 
-#: src/tray-monitor/tray_conf.c:314 src/tray-monitor/tray_conf.c:352
 #: src/dird/dird_conf.c:1526 src/dird/dird_conf.c:1586
 #, c-format
 msgid "Unknown resource type %d in save_resource.\n"
 msgstr "Nieznany typ zasobu %d w save_resource.\n"
 
-#: src/tray-monitor/authenticate.c:88
-msgid ""
-"Director authorization problem.\n"
-"Most likely the passwords do not agree.\n"
-"Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi."
-"html#SECTION003760000000000000000 for help.\n"
-msgstr ""
-"Problem autoryzacji Dyrektora.\n"
-"Najprawdopodobniej nie zgadzaj się hasa.\n"
-"Proszę zobacz http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi."
-"html#SECTION003760000000000000000 dla uzyskania pomocy.\n"
-
-#: src/tray-monitor/authenticate.c:97 src/console/authenticate.c:155
+#: src/console/authenticate.c:155
 #, c-format
 msgid "Bad response to Hello command: ERR=%s\n"
 msgstr "Za odpowiedź na komend Hello: ERR=%s\n"
 
-#: src/tray-monitor/authenticate.c:132 src/dird/authenticate.c:83
+#: src/dird/authenticate.c:83
 #: src/dird/authenticate.c:84
 #, c-format
 msgid "Error sending Hello to Storage daemon. ERR=%s\n"
 msgstr "Błąd w wysyaniu Hello do demona Przechowywania. ERR=%s\n"
 
-#: src/tray-monitor/authenticate.c:138
-msgid ""
-"Director and Storage daemon passwords or names not the same.\n"
-"Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi."
-"html#SECTION003760000000000000000 for help.\n"
-msgstr ""
-"Hasła demonów Dyrektora i Przechowywania nie s takie same.\n"
-"Proszę zobacz http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi."
-"html#SECTION003760000000000000000 dla uzyskania pomocy.\n"
-
-#: src/tray-monitor/authenticate.c:145
-msgid "bdird<stored: bad response to Hello command: ERR=%s\n"
-msgstr "bdird<stored: zła odpowiedź na komendę Hello: ERR=%s\n"
-
-#: src/tray-monitor/authenticate.c:152 src/dird/authenticate.c:162
-msgid "Storage daemon rejected Hello command\n"
-msgstr "Demon Przechowywania odrzuci komend Hello\n"
-
-#: src/tray-monitor/authenticate.c:178
-#, c-format
-msgid "Error sending Hello to File daemon. ERR=%s\n"
-msgstr "Błąd w wysyaniu Hello do demona Plików. ERR=%s\n"
-
-#: src/tray-monitor/authenticate.c:184
-msgid ""
-"Director and File daemon passwords or names not the same.\n"
-"Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi."
-"html#SECTION003760000000000000000 for help.\n"
-msgstr ""
-"Hasła demonów Dyrektora i Plików nie s takie same.\n"
-"Proszę zobacz http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi."
-"html#SECTION003760000000000000000 dla uzyskania pomocy.\n"
-
-#: src/tray-monitor/authenticate.c:191 src/dird/authenticate.c:266
+#: src/dird/authenticate.c:266
 #, c-format
 msgid "Bad response from File daemon to Hello command: ERR=%s\n"
 msgstr "Za odpowiedź z demona Plików na komend Hello: ERR=%s\n"
 
-#: src/tray-monitor/authenticate.c:198 src/dird/authenticate.c:277
+#: src/dird/authenticate.c:277
 msgid "File daemon rejected Hello command\n"
 msgstr "Demona Plików odrzuci komend Hello\n"
 
-#: src/tray-monitor/tray-monitor.c:114
-msgid ""
-"Written by Nicolas Boichat (2004)\n"
-"\n"
-"Version: %s (%s) %s %s %s\n"
-"\n"
-"Usage: tray-monitor [-c config_file] [-d debug_level]\n"
-"       -c <file>     set configuration file to file\n"
-"       -d <nn>       set debug level to <nn>\n"
-"       -dt           print timestamp in debug output\n"
-"       -t            test - read configuration and exit\n"
-"       -?            print this message.\n"
-"\n"
-msgstr ""
-"Napisany przez Nicolas Boichat (2004)\n"
-"\n"
-"Wersja: %s (%s) %s %s %s\n"
-"\n"
-"Użycie: tray-monitor [-c config_file] [-d debug_level]\n"
-"       -c <file>     ustaw plik konfiguracyjny na <file>\n"
-"       -d <nn>       ustaw poziom debugowania na <nn>\n"
-"       -dt           wyświetla znaczniki czasowe w debugingu\n"
-"       -t            test - odczytuje konfigurację i kończy działanie\n"
-"       -?            wyświetla ten komunikat.\n"
-"\n"
-
-#: src/tray-monitor/tray-monitor.c:270
-#, c-format
-msgid ""
-"Error: %d Monitor resources defined in %s. You must define one and only one "
-"Monitor resource.\n"
-msgstr ""
-"Bd: zdefiniowano %d zasoby Monitor w %s. Musisz zdefiniowa wycznie jeden i "
-"tylko jeden zasób Monitora.\n"
-
-#: src/tray-monitor/tray-monitor.c:301
-#, c-format
-msgid ""
-"No Client, Storage or Director resource defined in %s\n"
-"Without that I don't how to get status from the File, Storage or Director "
-"Daemon :-(\n"
-msgstr ""
-"Brak definicji zasobu Klienta, Przechowywania lub Dyrektora w %s\n"
-"Bez tego nie wiem jak mam otrzyma status z demonów Plików, Przechowywania i "
-"Dyrektora. :-(\n"
-
-#: src/tray-monitor/tray-monitor.c:323
-#, c-format
-msgid ""
-"Invalid refresh interval defined in %s\n"
-"This value must be greater or equal to 1 second and less or equal to 10 "
-"minutes (read value: %d).\n"
-msgstr ""
-"Niepoprawny interwa czasu zdefiniowany w %s\n"
-"Warto ta musi by wiksza lub rwna 1 sekundzie i mniejsza lub rwna 10 minutom "
-"(odczytana warto: %d).\n"
-
-#: src/tray-monitor/tray-monitor.c:330
-msgid "Bacula daemon status monitor"
-msgstr "Monitor statusu demona Bacula"
-
-#: src/tray-monitor/tray-monitor.c:339
-msgid "Open status window..."
-msgstr "Otwrz okno statusu..."
-
-#: src/tray-monitor/tray-monitor.c:345
-msgid "Exit"
-msgstr "Wyjcie"
-
-# Tray to tacka - nie do końca mi to pasuje: "Tackowy Monitor Baculi"
-#: src/tray-monitor/tray-monitor.c:357
-msgid "Bacula tray monitor"
-msgstr "Tackowy monitor Baculi"
-
-#: src/tray-monitor/tray-monitor.c:382
-msgid " (DIR)"
-msgstr " (DIR)"
-
-#: src/tray-monitor/tray-monitor.c:386
-msgid " (FD)"
-msgstr " (FD)"
-
-#: src/tray-monitor/tray-monitor.c:390
-msgid " (SD)"
-msgstr " (SD)"
-
-#: src/tray-monitor/tray-monitor.c:403
-msgid "Unknown status."
-msgstr "Nieznany status."
-
-#: src/tray-monitor/tray-monitor.c:477
-msgid "Refresh interval in seconds: "
-msgstr "Interwa odwierzania w sekundach: "
-
-#: src/tray-monitor/tray-monitor.c:485
-msgid "Refresh now"
-msgstr "Odwierz teraz"
-
-#: src/tray-monitor/tray-monitor.c:489
-msgid "About"
-msgstr "O Programie"
-
-#: src/tray-monitor/tray-monitor.c:493
-msgid "Close"
-msgstr "Zamknij"
-
-#: src/tray-monitor/tray-monitor.c:513
-#, c-format
-msgid "Disconnecting from Director %s:%d\n"
-msgstr "Rozłączanie od Dyrektora %s:%d\n"
-
-#: src/tray-monitor/tray-monitor.c:516
-#, c-format
-msgid "Disconnecting from Client %s:%d\n"
-msgstr "Rozłączanie od Klienta %s:%d\n"
-
-#: src/tray-monitor/tray-monitor.c:519
-#, c-format
-msgid "Disconnecting from Storage %s:%d\n"
-msgstr "Rozłączanie od Storage %s:%d\n"
-
-#: src/tray-monitor/tray-monitor.c:560 src/tray-monitor/tray-monitor.c:571
-msgid "Bacula Tray Monitor"
-msgstr "Monitor programu Bacula"
-
-#: src/tray-monitor/tray-monitor.c:562 src/tray-monitor/tray-monitor.c:573
-msgid "Written by Nicolas Boichat\n"
-msgstr "Napisany przez Nicolas Boichat\n"
-
-#: src/tray-monitor/tray-monitor.c:563 src/tray-monitor/tray-monitor.c:574
-msgid "Version"
-msgstr "Wersja"
-
-#: src/tray-monitor/tray-monitor.c:656
-#, c-format
-msgid "Error, currentitem is not a Client or a Storage..\n"
-msgstr "Bd, currentitem nie jest ani Klientem ani Storage...\n"
-
-#: src/tray-monitor/tray-monitor.c:730
-#, c-format
-msgid ""
-"Current job: %s\n"
-"Last job: %s"
-msgstr ""
-"Aktualne zadanie: %s\n"
-"Ostatnie zadanie: %s"
-
-#: src/tray-monitor/tray-monitor.c:742
-#, c-format
-msgid " (%d errors)"
-msgstr " (%d bdw)"
-
-#: src/tray-monitor/tray-monitor.c:745
-#, c-format
-msgid " (%d error)"
-msgstr " (%d bd)"
-
-#: src/tray-monitor/tray-monitor.c:783
-msgid "No current job."
-msgstr "Brak aktualnego zadania."
-
-#: src/tray-monitor/tray-monitor.c:786
-msgid "No last job."
-msgstr "Brak ostatniego zadania."
-
-#: src/tray-monitor/tray-monitor.c:794
-msgid "Job status: Created"
-msgstr "Status zadania: Stworzone"
-
-#: src/tray-monitor/tray-monitor.c:799
-msgid "Job status: Running"
-msgstr "Status zadania: Uruchomione"
-
-#: src/tray-monitor/tray-monitor.c:803
-msgid "Job status: Blocked"
-msgstr "Status zadania: Zablokowane"
-
-#: src/tray-monitor/tray-monitor.c:808
-msgid "Job status: Terminated"
-msgstr "Status zadania: Zakoczone"
-
-#: src/tray-monitor/tray-monitor.c:813
-msgid "Job status: Terminated in error"
-msgstr "Status zadania: Zakoczone przez bd"
-
-#: src/tray-monitor/tray-monitor.c:819
-msgid "Job status: Error"
-msgstr "Status zadania: Bd"
-
-#: src/tray-monitor/tray-monitor.c:823
-msgid "Job status: Fatal error"
-msgstr "Status zadania: Błąd krytyczny"
-
-#: src/tray-monitor/tray-monitor.c:828
-msgid "Job status: Verify differences"
-msgstr "Status zadania: Rnice przy weryfikacji"
-
-#: src/tray-monitor/tray-monitor.c:833
-msgid "Job status: Canceled"
-msgstr "Status zadania: Anulowane"
-
-#: src/tray-monitor/tray-monitor.c:838
-msgid "Job status: Waiting on File daemon"
-msgstr "Status zadania: Oczekiwanie na demon Plików"
-
-#: src/tray-monitor/tray-monitor.c:843
-msgid "Job status: Waiting on the Storage daemon"
-msgstr "Status zadania: Oczekiwanie na demon Przechowywania"
-
-#: src/tray-monitor/tray-monitor.c:848
-msgid "Job status: Waiting for new media"
-msgstr "Status zadania: Oczekiwanie na nowe media"
-
-#: src/tray-monitor/tray-monitor.c:853
-msgid "Job status: Waiting for Mount"
-msgstr "Status zadania: Oczekiwanie na Zamontowanie"
-
-#: src/tray-monitor/tray-monitor.c:858
-msgid "Job status: Waiting for storage resource"
-msgstr "Status zadania: Oczekiwanie na zasoby przechowywania"
-
-#: src/tray-monitor/tray-monitor.c:863
-msgid "Job status: Waiting for job resource"
-msgstr "Status zadania: Oczekiwanie na zasoby zadania"
-
-#: src/tray-monitor/tray-monitor.c:868
-msgid "Job status: Waiting for Client resource"
-msgstr "Status zadania: Oczekiwanie na zasoby Klienta"
-
-#: src/tray-monitor/tray-monitor.c:873
-msgid "Job status: Waiting for maximum jobs"
-msgstr "Status zadania: Oczekiwanie ze wzgldu na maksymaln ilo zada"
-
-#: src/tray-monitor/tray-monitor.c:878
-msgid "Job status: Waiting for start time"
-msgstr "Status zadania: Oczekiwanie na czas uruchomienia"
-
-#: src/tray-monitor/tray-monitor.c:883
-msgid "Job status: Waiting for higher priority jobs to finish"
-msgstr "Status zadania: Oczekiwanie na zakoczenie zadań o wyszym priorytecie"
-
-#: src/tray-monitor/tray-monitor.c:888
-#, c-format
-msgid "Unknown job status %c."
-msgstr "Nieznany status zadania %c."
-
-#: src/tray-monitor/tray-monitor.c:889
-#, c-format
-msgid "Job status: Unknown(%c)"
-msgstr "Status zadania: Nieznany(%c)"
-
-#: src/tray-monitor/tray-monitor.c:896
-#, c-format
-msgid "Bad scan : '%s' %d\n"
-msgstr "Ze skanowanie : '%s' %d\n"
-
-#: src/tray-monitor/tray-monitor.c:936 src/console/console.c:1138
+#: src/console/console.c:1138
 #, c-format
 msgid "Connecting to Director %s:%d\n"
 msgstr "Podłączenie do Dyrektora %s:%d\n"
 
-#: src/tray-monitor/tray-monitor.c:937 src/qt-console/bcomm/dircomm.cpp:102
+#: src/qt-console/bcomm/dircomm.cpp:102
 #, c-format
 msgid "Connecting to Director %s:%d"
 msgstr "Podłączenie do Dyrektora %s:%d"
 
-#: src/tray-monitor/tray-monitor.c:938 src/wx-console/console_thread.cpp:428
-#: src/qt-console/bcomm/dircomm.cpp:170
-msgid "Director daemon"
-msgstr "Demon Dyrektora"
-
-#: src/tray-monitor/tray-monitor.c:943
-#, c-format
-msgid "Connecting to Client %s:%d\n"
-msgstr "Podłączenie do Klienta %s:%d\n"
-
-#: src/tray-monitor/tray-monitor.c:944
-#, c-format
-msgid "Connecting to Client %s:%d"
-msgstr "Podłączenie do Klienta %s:%d"
-
-#: src/tray-monitor/tray-monitor.c:945
-msgid "File daemon"
-msgstr "Demon Plików"
-
-#: src/tray-monitor/tray-monitor.c:950
-#, c-format
-msgid "Connecting to Storage %s:%d\n"
-msgstr "Podłączenie do Storage %s:%d\n"
-
-#: src/tray-monitor/tray-monitor.c:951
-#, c-format
-msgid "Connecting to Storage %s:%d"
-msgstr "Podłączenie do Storage %s:%d"
-
-#: src/tray-monitor/tray-monitor.c:956 src/tray-monitor/tray-monitor.c:994
-#, c-format
-msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
-msgstr "Błąd currentitem nie jest Klientem, Storage ani Dyrektorem..\n"
-
-#: src/tray-monitor/tray-monitor.c:962
-msgid "Cannot connect to daemon.\n"
-msgstr "Nie można połączyć się do demona.\n"
-
-#: src/tray-monitor/tray-monitor.c:963
-msgid "Cannot connect to daemon."
-msgstr "Nie można połączyć się do demona."
-
-#: src/tray-monitor/tray-monitor.c:975
-#, c-format
-msgid "Authentication error : %s"
-msgstr "Bad autentykacji : %s"
-
-#: src/tray-monitor/tray-monitor.c:982
-msgid "Opened connection with Director daemon.\n"
-msgstr "Otwarte poczenie z demonem Dyrektora.\n"
-
-#: src/tray-monitor/tray-monitor.c:983
-msgid "Opened connection with Director daemon."
-msgstr "Otwarte poczenie z demonem Dyrektora."
-
-#: src/tray-monitor/tray-monitor.c:986
-msgid "Opened connection with File daemon.\n"
-msgstr "Otwarte poczenie z demonem plikw.\n"
-
-#: src/tray-monitor/tray-monitor.c:987
-msgid "Opened connection with File daemon."
-msgstr "Otwarte poczenie z demonem plikw."
-
-#: src/tray-monitor/tray-monitor.c:990
-msgid "Opened connection with Storage daemon.\n"
-msgstr "Otwarte poczenie z demonem Przechowywania.\n"
-
-#: src/tray-monitor/tray-monitor.c:991
-msgid "Opened connection with Storage daemon."
-msgstr "Otwarte poczenie z demonem Przechowywania."
-
-#: src/tray-monitor/tray-monitor.c:1028
-msgid "<< Error: BNET_PROMPT signal received. >>\n"
-msgstr "<< Błąd: otrzymano sygnał BNET_PROMPT. >>\n"
-
-#: src/tray-monitor/tray-monitor.c:1033 src/wx-console/console_thread.cpp:494
-msgid "<< Heartbeat signal received, answered. >>\n"
-msgstr "<< Otrzymano sygnał Heartbeat, odpowiedziano. >>\n"
-
-#: src/tray-monitor/tray-monitor.c:1037
-msgid "<< Unexpected signal received : %s >>\n"
-msgstr "<< Otrzymano nieoczekiwany sygnał : %s >>\n"
-
-#: src/tray-monitor/tray-monitor.c:1042
-msgid "<ERROR>\n"
-msgstr "<BŁĄD>\n"
-
-#: src/tray-monitor/tray-monitor.c:1046
-msgid "Error : BNET_HARDEOF or BNET_ERROR"
-msgstr "Błąd : BNET_HARDEOF lub BNET_ERROR"
-
-#: src/tray-monitor/tray-monitor.c:1052
-msgid "<STOP>\n"
-msgstr "<STOP>\n"
-
-#: src/tray-monitor/tray-monitor.c:1056
-msgid "Error : Connection closed."
-msgstr "Błąd : Połączenie zamknięte."
-
 #: src/cats/mysql.c:81
 msgid "A user name for MySQL must be supplied.\n"
 msgstr "Nazwa użytkownika dla MySQL powinna by dostarczona.\n"
@@ -3801,12 +3372,12 @@ msgstr "Nie można stworzyć pliku stanu. %s ERR=%s\n"
 msgid "Write final hdr error: ERR=%s\n"
 msgstr "Błąd zapisu . ERR=%s\n"
 
-#: src/lib/lex.c:93 src/wx-console/console_thread.cpp:212
+#: src/lib/lex.c:93
 #, c-format
 msgid "Problem probably begins at line %d.\n"
 msgstr "Problem najprawdopodobniej zaczyna się od linii %d.\n"
 
-#: src/lib/lex.c:98 src/wx-console/console_thread.cpp:217
+#: src/lib/lex.c:98
 msgid ""
 "Config error: %s\n"
 "            : line %d, col %d of file %s\n"
@@ -5006,13 +4577,12 @@ msgstr ""
 msgid "Verify"
 msgstr "Weryfikacja OK"
 
-#: src/lib/util.c:365 src/wx-console/wxbrestorepanel.cpp:404
-#: src/wx-console/wxbrestorepanel.cpp:2000
+#: src/lib/util.c:365
 #, fuzzy
 msgid "Restore"
 msgstr "Odtwarzanie Anulowane"
 
-#: src/lib/util.c:368 src/wx-console/wxbmainframe.cpp:276
+#: src/lib/util.c:368
 #, fuzzy
 msgid "Console"
 msgstr "Zamknij"
@@ -5620,16 +5190,7 @@ msgid "Level"
 msgstr "nigdy"
 
 #: src/dird/ua_run.c:210 src/dird/ua_select.c:167 src/dird/ua_cmds.c:1095
-#: src/dird/ua_dotcmds.c:478 src/wx-console/wxbrestorepanel.cpp:339
-#: src/wx-console/wxbrestorepanel.cpp:355
-#: src/wx-console/wxbrestorepanel.cpp:479
-#: src/wx-console/wxbrestorepanel.cpp:480
-#: src/wx-console/wxbrestorepanel.cpp:490
-#: src/wx-console/wxbrestorepanel.cpp:491
-#: src/wx-console/wxbrestorepanel.cpp:1173
-#: src/wx-console/wxbrestorepanel.cpp:1176
-#: src/wx-console/wxbrestorepanel.cpp:1845
-#: src/wx-console/wxbrestorepanel.cpp:1916
+#: src/dird/ua_dotcmds.c:478
 #, fuzzy
 msgid "Storage"
 msgstr "Demon Skadowania"
@@ -5652,43 +5213,22 @@ msgstr "Odtwarzanie Anulowane"
 
 #: src/dird/ua_run.c:216 src/dird/ua_select.c:337 src/dird/ua_select.c:446
 #: src/dird/ua_cmds.c:1096 src/dird/ua_dotcmds.c:479
-#: src/wx-console/wxbrestorepanel.cpp:336
-#: src/wx-console/wxbrestorepanel.cpp:354
-#: src/wx-console/wxbrestorepanel.cpp:431
-#: src/wx-console/wxbrestorepanel.cpp:432
-#: src/wx-console/wxbrestorepanel.cpp:442
-#: src/wx-console/wxbrestorepanel.cpp:443
-#: src/wx-console/wxbrestorepanel.cpp:700
-#: src/wx-console/wxbrestorepanel.cpp:1133
-#: src/wx-console/wxbrestorepanel.cpp:1136
-#: src/wx-console/wxbrestorepanel.cpp:1238
-#: src/wx-console/wxbrestorepanel.cpp:1838
-#: src/wx-console/wxbrestorepanel.cpp:1840
-#: src/wx-console/wxbrestorepanel.cpp:1914
-#: src/wx-console/wxbrestorepanel.cpp:1970
 #, fuzzy
 msgid "Client"
 msgstr "Klient:"
 
-#: src/dird/ua_run.c:218 src/wx-console/wxbrestorepanel.cpp:356
-#: src/wx-console/wxbrestorepanel.cpp:854
-#: src/wx-console/wxbrestorepanel.cpp:1918
+#: src/dird/ua_run.c:218
 #, fuzzy
 msgid "When"
 msgstr "Kiedy:"
 
-#: src/dird/ua_run.c:219 src/wx-console/wxbrestorepanel.cpp:357
-#: src/wx-console/wxbrestorepanel.cpp:1128
-#: src/wx-console/wxbrestorepanel.cpp:1921
+#: src/dird/ua_run.c:219
 #, fuzzy
 msgid "Priority"
 msgstr "Priorytet:"
 
 #: src/dird/ua_run.c:224 src/dird/ua_update.c:616 src/dird/ua_select.c:535
-#: src/dird/ua_select.c:633 src/wx-console/wxbrestorepanel.cpp:338
-#: src/wx-console/wxbrestorepanel.cpp:527
-#: src/wx-console/wxbrestorepanel.cpp:537
-#: src/wx-console/wxbrestorepanel.cpp:1834
+#: src/dird/ua_select.c:633
 msgid "Pool"
 msgstr ""
 
@@ -5697,15 +5237,12 @@ msgstr ""
 msgid "Verify Job"
 msgstr "Weryfikacja OK"
 
-#: src/dird/ua_run.c:229 src/wx-console/wxbrestorepanel.cpp:349
-#: src/wx-console/wxbrestorepanel.cpp:1899
+#: src/dird/ua_run.c:229
 #, fuzzy
 msgid "Bootstrap"
 msgstr "Bootstrap:"
 
-#: src/dird/ua_run.c:230 src/wx-console/wxbrestorepanel.cpp:350
-#: src/wx-console/wxbrestorepanel.cpp:1104
-#: src/wx-console/wxbrestorepanel.cpp:1901
+#: src/dird/ua_run.c:230
 #, fuzzy
 msgid "Where"
 msgstr "Gdzie:"
@@ -5715,13 +5252,7 @@ msgstr "Gdzie:"
 msgid "File Relocation"
 msgstr "Demon Plików"
 
-#: src/dird/ua_run.c:232 src/wx-console/wxbrestorepanel.cpp:352
-#: src/wx-console/wxbrestorepanel.cpp:1112
-#: src/wx-console/wxbrestorepanel.cpp:1905
-#: src/wx-console/wxbrestorepanel.cpp:1906
-#: src/wx-console/wxbrestorepanel.cpp:1907
-#: src/wx-console/wxbrestorepanel.cpp:1908
-#: src/wx-console/wxbrestorepanel.cpp:1909
+#: src/dird/ua_run.c:232
 #, fuzzy
 msgid "Replace"
 msgstr "Zamiana:"
@@ -11462,13 +10993,13 @@ msgstr "%s nie jest liczbą. Musisz wybrać liczbę między 1 a %d\n"
 msgid "You must enter a number between 1 and %d\n"
 msgstr "Musisz wybrać liczbę między 1 a %d\n"
 
-#: src/console/console.c:1155 src/wx-console/console_thread.cpp:399
+#: src/console/console.c:1155
 #: src/qt-console/bcomm/dircomm.cpp:130
 #, fuzzy, c-format
 msgid "Failed to initialize TLS context for Console \"%s\".\n"
 msgstr "Nieudana inicjalizacja kontekstu TLS dla Dyrektora \"%s\" w %s.\n"
 
-#: src/console/console.c:1175 src/wx-console/console_thread.cpp:420
+#: src/console/console.c:1175
 #: src/qt-console/bcomm/dircomm.cpp:152
 #, fuzzy, c-format
 msgid "Failed to initialize TLS context for Director \"%s\".\n"
@@ -17516,797 +17047,6 @@ msgstr ""
 "\n"
 "BŁĄD Bacula: "
 
-#: src/wx-console/wxbmainframe.cpp:246
-msgid "&About...\tF1"
-msgstr "&About...\tF1"
-
-#: src/wx-console/wxbmainframe.cpp:246
-msgid "Show about dialog"
-msgstr "Pokaż dialog o"
-
-#: src/wx-console/wxbmainframe.cpp:248 src/wx-console/wxbmainframe.cpp:619
-msgid "Connect"
-msgstr "Połącz"
-
-#: src/wx-console/wxbmainframe.cpp:248 src/wx-console/wxbmainframe.cpp:620
-msgid "Connect to the director"
-msgstr "Połącz do Dyrektora"
-
-#: src/wx-console/wxbmainframe.cpp:249
-msgid "Disconnect"
-msgstr "Rozłącz"
-
-#: src/wx-console/wxbmainframe.cpp:249
-msgid "Disconnect of the director"
-msgstr "Rozłączanie dyrektora"
-
-#: src/wx-console/wxbmainframe.cpp:251
-msgid "Change of configuration file"
-msgstr "Zmiana pliku konfiguracyjnego"
-
-#: src/wx-console/wxbmainframe.cpp:251
-msgid "Change your default configuration file"
-msgstr "Zmień swój domyślny plik konfiguracyjny"
-
-#: src/wx-console/wxbmainframe.cpp:252
-msgid "Edit your configuration file"
-msgstr "Wyedytuj swój plik konfiguracyjny"
-
-#: src/wx-console/wxbmainframe.cpp:254
-msgid "E&xit\tAlt-X"
-msgstr "&Wyjście\tAlt-X"
-
-#: src/wx-console/wxbmainframe.cpp:254
-msgid "Quit this program"
-msgstr "Zamknij ten program"
-
-#: src/wx-console/wxbmainframe.cpp:258
-msgid "&File"
-msgstr "&Pliki"
-
-#: src/wx-console/wxbmainframe.cpp:259
-msgid "&Help"
-msgstr "&Pomoc"
-
-#: src/wx-console/wxbmainframe.cpp:267 src/wx-console/main.cpp:124
-#, c-format
-msgid "Welcome to bacula bwx-console %s (%s)!\n"
-msgstr "Witamy w konsoli baculi bwx-console %s (%s)!\n"
-
-#: src/wx-console/wxbmainframe.cpp:283
-msgid ""
-"Warning : Unicode is disabled because you are using wxWidgets for GTK+ 1.2.\n"
-msgstr ""
-"Ostrzeżenie : Unicode jest wyłączony ponieważ używane jest wxWidgets dla GTK+ 1.2.\n"
-
-#: src/wx-console/wxbmainframe.cpp:287
-msgid ""
-"Warning : There is a problem with wxWidgets for GTK+ 2.0 without Unicode "
-"support when handling non-ASCII filenames: Every non-ASCII character in such "
-"filenames will be replaced by an interrogation mark.\n"
-"If this behaviour disturbs you, please build bwx-console against a Unicode "
-"version of wxWidgets for GTK+ 2.0.\n"
-"---\n"
-msgstr ""
-
-#: src/wx-console/wxbmainframe.cpp:291
-#: src/wx-console/wxbhistorytextctrl.cpp:82
-#: src/wx-console/wxbhistorytextctrl.cpp:153
-msgid "Type your command below:"
-msgstr "Napisz swoje polecenie poniżej:"
-
-#: src/wx-console/wxbmainframe.cpp:298
-msgid "Send"
-msgstr "Wysłano"
-
-#: src/wx-console/wxbmainframe.cpp:375 src/wx-console/wxbmainframe.cpp:387
-msgid "Error while parsing command line arguments, using defaults.\n"
-msgstr "Błąd podczas parsowania argumentów lini komend, używam domyślnych.\n"
-
-#: src/wx-console/wxbmainframe.cpp:376 src/wx-console/wxbmainframe.cpp:388
-msgid "Usage: bwx-console [-c configfile] [-w tmp]\n"
-msgstr "Użycie: bwx-console [-c configfile] [-w tmp]\n"
-
-#: src/wx-console/wxbmainframe.cpp:417
-#, c-format
-msgid ""
-"It seems that it is the first time you run bwx-console.\n"
-"This file (%s) has been choosen as default configuration file.\n"
-"Do you want to edit it? (if you click No you will have to select another "
-"file)"
-msgstr ""
-"wydaje się że to twoje pierwsze uruchomienie konsoli bwx.\n"
-"Ten plik (%s) został wybrany jako domyślny plik konfiguracyjny.\n"
-"Czy chcesz go edytować? (jeśli wybierzesz 'No' będziesz musiał wybrać inny "
-"plik)"
-
-#: src/wx-console/wxbmainframe.cpp:419
-msgid "First run"
-msgstr "Pierwsze uruchomienie"
-
-#: src/wx-console/wxbmainframe.cpp:436
-#, c-format
-msgid ""
-"Unable to read %s\n"
-"Error: %s\n"
-"Do you want to choose another one? (Press no to edit this file)"
-msgstr ""
-"Nie można odczytać %s\n"
-"Błąd: %s\n"
-"Czy chcesz wybrać inny? (Wybierz 'no' by edytowac ten plik)"
-
-#: src/wx-console/wxbmainframe.cpp:438
-msgid "Unable to read configuration file"
-msgstr "Nie można odczytać pliku konfiguracyjnego"
-
-#: src/wx-console/wxbmainframe.cpp:450
-msgid "Please choose a configuration file to use"
-msgstr "Proszę wybierz używany plik konfiguracyjny"
-
-#: src/wx-console/wxbmainframe.cpp:463
-msgid "This configuration file has been successfully read, use it as default?"
-msgstr "Ten plik konfiguracyjny został z powodzeniem odczytany, czy użyć go jako domyślny?"
-
-#: src/wx-console/wxbmainframe.cpp:464
-msgid "Configuration file read successfully"
-msgstr "Plik konfiguracyjny odczytany z powodzeniem"
-
-#: src/wx-console/wxbmainframe.cpp:474
-msgid "Using this configuration file: %s\n"
-msgstr "Użyj tego pliku konfiguracyjnego: %s\n"
-
-#: src/wx-console/wxbmainframe.cpp:479
-msgid "Connecting to the director..."
-msgstr "Podłączenie do dyrektora..."
-
-#: src/wx-console/wxbmainframe.cpp:494
-msgid "Failed to unregister a data parser !"
-msgstr "Niepowodzenie przy wyrejestrowaniu parsera danych!"
-
-#: src/wx-console/wxbmainframe.cpp:502
-msgid "Quitting.\n"
-msgstr "Wychodzenie.\n"
-
-#: src/wx-console/wxbmainframe.cpp:517
-msgid ""
-"Welcome to Bacula bwx-console.\n"
-"Written by Nicolas Boichat <nicolas@boichat.ch>\n"
-"Copyright (C), 2005-2007 Free Software Foundation Europe, e.V.\n"
-msgstr ""
-"Witamy w Bacula bwx-console.\n"
-"Napisane przez Nicolas Boichat <nicolas@boichat.ch>\n"
-"Copyright (C), 2005-2007 Free Software Foundation Europe, e.V.\n"
-
-#: src/wx-console/wxbmainframe.cpp:521
-msgid "About Bacula bwx-console"
-msgstr "O Bacula bwx-console"
-
-#: src/wx-console/wxbmainframe.cpp:527
-msgid "Please choose your default configuration file"
-msgstr "Proszę wybierz swój plik konfiguracyjny"
-
-#: src/wx-console/wxbmainframe.cpp:531
-msgid "Use this configuration file as default?"
-msgstr "Użyć tego pliku konfiguracyjnego jako domyślnego?"
-
-#: src/wx-console/wxbmainframe.cpp:532
-msgid "Configuration file"
-msgstr "Plik konfiguracyjny"
-
-#: src/wx-console/wxbmainframe.cpp:603
-msgid "Console thread terminated."
-msgstr "Zakończono wątek konsoli."
-
-#: src/wx-console/wxbmainframe.cpp:611
-msgid "Connection to the director lost. Quit program?"
-msgstr "Podłączenie do dyrektora utracone. Zkończyć program?"
-
-#: src/wx-console/wxbmainframe.cpp:612
-msgid "Connection lost"
-msgstr "Połączenie utracone."
-
-#: src/wx-console/wxbmainframe.cpp:628
-msgid "Connected to the director."
-msgstr "Podłączony do dyrektora."
-
-#: src/wx-console/wxbmainframe.cpp:651
-#, fuzzy
-msgid "Reconnect"
-msgstr "Utworzone"
-
-#: src/wx-console/wxbmainframe.cpp:652
-#, fuzzy
-msgid "Reconnect to the director"
-msgstr "Podłączenie do Dyrektora %s:%d"
-
-#: src/wx-console/wxbmainframe.cpp:666
-msgid "Disconnected of the director."
-msgstr "Rozłączanie dyrektora."
-
-#: src/wx-console/wxbmainframe.cpp:685 src/wx-console/wxbrestorepanel.cpp:720
-msgid "Unexpected question has been received.\n"
-msgstr "Otrzymano nieoczekiwane pytanie.\n"
-
-#: src/wx-console/wxbmainframe.cpp:708 src/wx-console/wxbmainframe.cpp:725
-msgid "bwx-console: unexpected director's question."
-msgstr "bwx-console: nieoczekiwane zapytanie Dyrektora."
-
-#: src/wx-console/wxbconfigpanel.cpp:213
-msgid "Apply"
-msgstr "Zastosuj"
-
-#: src/wx-console/console_thread.cpp:125
-msgid ""
-"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
-"Director \"%s\" in config file.\n"
-"At least one CA certificate store is required.\n"
-msgstr ""
-"Ani \"TLS CA Certificate\", ani \"TLS CA Certificate Dir\" nie są "
-"zdefiniowane dla Dyrektora \"%s\" w pliku konfiguracyjnym.\n"
-" Co najmniej jedno skadowanie certyfikatu CA jest wymagane.\n"
-
-#: src/wx-console/console_thread.cpp:132
-msgid ""
-"No Director resource defined in config file.\n"
-"Without that I don't how to speak to the Director :-(\n"
-msgstr ""
-"Brak definicji zasobu Dyrektora w pliku konfiguracyjnym\n"
-"Bez tego nie wiem jak rozmawiać z Dyrektorem :-(\n"
-
-#: src/wx-console/console_thread.cpp:151
-msgid ""
-"Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
-"Console \"%s\" in config file.\n"
-msgstr ""
-"Ani \"TLS CA Certificate\", ani \"TLS CA Certificate Dir\" nie zostały "
-"zdefiniowane dla Konsoli \"%s\" w pliku konfiguracyjnym.\n"
-
-#: src/wx-console/console_thread.cpp:173
-msgid "Error while initializing windows sockets...\n"
-msgstr "Błąd w trakcie inicjalizacji gniazd windows...\n"
-
-#: src/wx-console/console_thread.cpp:189
-msgid "Error while cleaning up windows sockets...\n"
-msgstr "Błąd w trakcie czyszczenia gniazd windows...\n"
-
-#: src/wx-console/console_thread.cpp:228
-msgid "Error while initializing library."
-msgstr "Błąd w trakcie inicjalizacji biblioteki."
-
-#: src/wx-console/console_thread.cpp:256
-msgid "Cryptographic library initialization failed.\n"
-msgstr "Nieudana inicjalizacja biblioteki kryptograficznej.\n"
-
-#: src/wx-console/console_thread.cpp:260
-msgid "Please correct configuration file.\n"
-msgstr "Proszę popraw plik konfiguracyjny.\n"
-
-#: src/wx-console/console_thread.cpp:302
-msgid "Error : Library not initialized\n"
-msgstr "Błąd : Nie zainicjalizowana biblioteka\n"
-
-#: src/wx-console/console_thread.cpp:313
-msgid "Error : No configuration file loaded\n"
-msgstr "Błąd : Nie załadowano pliku konfiguracyjnego\n"
-
-#: src/wx-console/console_thread.cpp:323
-msgid "Connecting...\n"
-msgstr "Łączenie...\n"
-
-#: src/wx-console/console_thread.cpp:339
-msgid "Error : No director defined in config file.\n"
-msgstr "Błąd : Brak definicji dyrektora w pliku konfiguracyjnym.\n"
-
-#: src/wx-console/console_thread.cpp:351
-msgid "Multiple directors found in your config file.\n"
-msgstr "Znaleziono wielu dyrektorów w twoim pliku konfiguracyjnym.\n"
-
-#: src/wx-console/console_thread.cpp:360
-#, c-format
-msgid "Please choose a director (1-%d): "
-msgstr "Proszę wybierz dyrektora (1-%d): "
-
-#: src/wx-console/console_thread.cpp:389
-#, c-format
-msgid "Passphrase for Console \"%s\" TLS private key: "
-msgstr "Hasło dla klucza prywatnego TLS Konsoli \"%s\": "
-
-#: src/wx-console/console_thread.cpp:410
-#, c-format
-msgid "Passphrase for Director \"%s\" TLS private key: "
-msgstr "Hasło dla klucza prywatnego TLS Dyrektora \"%s\": "
-
-#: src/wx-console/console_thread.cpp:432
-msgid "Failed to connect to the director\n"
-msgstr "Nieudane podłączenie do dyrektora\n"
-
-#: src/wx-console/console_thread.cpp:442
-msgid "Connected\n"
-msgstr "Podłączony\n"
-
-#: src/wx-console/console_thread.cpp:499
-msgid "<< Unexpected signal received : "
-msgstr "<< Otrzymano nieoczekiwany sygnał : "
-
-#: src/wx-console/console_thread.cpp:519
-msgid "Connection terminated\n"
-msgstr "Podłączenie zakończone\n"
-
-#: src/wx-console/wxbconfigfileeditor.cpp:65
-msgid "Config file editor"
-msgstr "Edytor pliku konfiguracyjnego"
-
-#: src/wx-console/wxbconfigfileeditor.cpp:75
-msgid "# Bacula bwx-console Configuration File\n"
-msgstr "# Plik Konfiguracyjny Bacula bwx-console\n"
-
-#: src/wx-console/wxbconfigfileeditor.cpp:111
-msgid "Save and close"
-msgstr "Zapisz i zamknij"
-
-#: src/wx-console/wxbconfigfileeditor.cpp:112
-msgid "Close without saving"
-msgstr "Zamknij bez zapisywania"
-
-#: src/wx-console/wxbconfigfileeditor.cpp:139
-msgid "Unable to write to %s\n"
-msgstr "Nie mogę pisać do %s\n"
-
-#: src/wx-console/wxbconfigfileeditor.cpp:140
-msgid "Error while saving"
-msgstr "Błąd w trakcie zapisywania"
-
-#: src/wx-console/main.cpp:119
-msgid "Bacula bwx-console"
-msgstr "Bacula bwx-console"
-
-#: src/wx-console/wxbrestorepanel.cpp:234
-#: src/wx-console/wxbrestorepanel.cpp:1947
-#: src/wx-console/wxbrestorepanel.cpp:1976
-msgid "Enter restore mode"
-msgstr "Wprowadź tryb odtwarzania"
-
-#: src/wx-console/wxbrestorepanel.cpp:237
-msgid "Cancel restore"
-msgstr "Anuluj odtwarzanie"
-
-#: src/wx-console/wxbrestorepanel.cpp:263
-#: src/wx-console/wxbrestorepanel.cpp:317
-msgid "Add"
-msgstr "Dodaj"
-
-#: src/wx-console/wxbrestorepanel.cpp:265
-#: src/wx-console/wxbrestorepanel.cpp:319
-msgid "Remove"
-msgstr "Usuń"
-
-#: src/wx-console/wxbrestorepanel.cpp:267
-#: src/wx-console/wxbrestorepanel.cpp:321
-msgid "Refresh"
-msgstr "Odwierz"
-
-#: src/wx-console/wxbrestorepanel.cpp:286
-msgid "M"
-msgstr "M"
-
-#: src/wx-console/wxbrestorepanel.cpp:290
-msgid "Filename"
-msgstr "Nazwa pliku"
-
-#: src/wx-console/wxbrestorepanel.cpp:294
-msgid "Size"
-msgstr "Rozmiar"
-
-#: src/wx-console/wxbrestorepanel.cpp:298
-msgid "Date"
-msgstr "Data"
-
-#: src/wx-console/wxbrestorepanel.cpp:302
-msgid "Perm."
-msgstr "Prawa"
-
-#: src/wx-console/wxbrestorepanel.cpp:306
-msgid "User"
-msgstr "Użytkownik"
-
-#: src/wx-console/wxbrestorepanel.cpp:310
-msgid "Group"
-msgstr "Grupa"
-
-#: src/wx-console/wxbrestorepanel.cpp:335
-#: src/wx-console/wxbrestorepanel.cpp:348
-#: src/wx-console/wxbrestorepanel.cpp:503
-#: src/wx-console/wxbrestorepanel.cpp:513
-#: src/wx-console/wxbrestorepanel.cpp:516
-#: src/wx-console/wxbrestorepanel.cpp:1811
-#: src/wx-console/wxbrestorepanel.cpp:1897
-msgid "Job Name"
-msgstr "Nazwa Zadania"
-
-#: src/wx-console/wxbrestorepanel.cpp:337
-#: src/wx-console/wxbrestorepanel.cpp:353
-#: src/wx-console/wxbrestorepanel.cpp:455
-#: src/wx-console/wxbrestorepanel.cpp:456
-#: src/wx-console/wxbrestorepanel.cpp:466
-#: src/wx-console/wxbrestorepanel.cpp:467
-#: src/wx-console/wxbrestorepanel.cpp:1153
-#: src/wx-console/wxbrestorepanel.cpp:1156
-#: src/wx-console/wxbrestorepanel.cpp:1239
-#: src/wx-console/wxbrestorepanel.cpp:1849
-#: src/wx-console/wxbrestorepanel.cpp:1851
-#: src/wx-console/wxbrestorepanel.cpp:1912
-msgid "Fileset"
-msgstr "Zestaw plików"
-
-#: src/wx-console/wxbrestorepanel.cpp:340
-#: src/wx-console/wxbrestorepanel.cpp:1233
-#: src/wx-console/wxbrestorepanel.cpp:1249
-#: src/wx-console/wxbrestorepanel.cpp:1251
-#: src/wx-console/wxbrestorepanel.cpp:1259
-#: src/wx-console/wxbrestorepanel.cpp:1261
-#: src/wx-console/wxbrestorepanel.cpp:1280
-#: src/wx-console/wxbrestorepanel.cpp:1287
-#: src/wx-console/wxbrestorepanel.cpp:1839
-#: src/wx-console/wxbrestorepanel.cpp:1850
-#: src/wx-console/wxbrestorepanel.cpp:1971
-msgid "Before"
-msgstr "Przed"
-
-#: src/wx-console/wxbrestorepanel.cpp:342
-msgid "Please configure parameters concerning files to restore :"
-msgstr "Proszę skonfiguruj parametry związane z plikami do odtwarzania :"
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-#: src/wx-console/wxbrestorepanel.cpp:1905
-msgid "always"
-msgstr "zawsze"
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-msgid "if newer"
-msgstr "jeśli nowszy"
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-msgid "if older"
-msgstr "jeśli starszy"
-
-#: src/wx-console/wxbrestorepanel.cpp:351
-#: src/wx-console/wxbrestorepanel.cpp:1908
-msgid "never"
-msgstr "nigdy"
-
-#: src/wx-console/wxbrestorepanel.cpp:359
-msgid "Please configure parameters concerning files restoration :"
-msgstr "Proszę skonfigurować parametry dotyczących odtwarzania plików :"
-
-#: src/wx-console/wxbrestorepanel.cpp:427
-msgid "Getting parameters list."
-msgstr "Pobieranie listy parametrów."
-
-#: src/wx-console/wxbrestorepanel.cpp:435
-msgid "Error : no clients returned by the director."
-msgstr "Błąd : dyrektor nie zwrócił klientów."
-
-#: src/wx-console/wxbrestorepanel.cpp:459
-msgid "Error : no filesets returned by the director."
-msgstr "Błąd : dyrektor nie zwrócił żadnych fileset'ów."
-
-#: src/wx-console/wxbrestorepanel.cpp:483
-msgid "Error : no storage returned by the director."
-msgstr "Błąd : dyrektor nie zwrócił storage."
-
-#: src/wx-console/wxbrestorepanel.cpp:506
-#: src/wx-console/wxbrestorepanel.cpp:530
-msgid "Error : no jobs returned by the director."
-msgstr "Błąd : dyrektor nie zwrócił zadań."
-
-#: src/wx-console/wxbrestorepanel.cpp:516
-msgid "RestoreFiles"
-msgstr "RestoreFiles"
-
-#: src/wx-console/wxbrestorepanel.cpp:551
-msgid "Please configure your restore parameters."
-msgstr "Proszę skonfiguruj swoje parametry odtwarzania."
-
-#: src/wx-console/wxbrestorepanel.cpp:556
-msgid "Please select a client."
-msgstr "Proszę zaznacz klienta."
-
-#: src/wx-console/wxbrestorepanel.cpp:560
-msgid "Please select a restore date."
-msgstr "Proszę wskaż datę odtwarzania."
-
-#: src/wx-console/wxbrestorepanel.cpp:565
-msgid "Building restore tree..."
-msgstr "Budowanie drzewa odtwarzania..."
-
-#: src/wx-console/wxbrestorepanel.cpp:613
-msgid "Error while starting restore: "
-msgstr "Błąd w trakcie uruchamiania odtwarzania: "
-
-#: src/wx-console/wxbrestorepanel.cpp:705
-msgid ""
-"Right click on a file or on a directory, or double-click on its mark to add "
-"it to the restore list."
-msgstr ""
-"Kliknięcie prawym przyciskiem myszy na pliku lub katalogu, lub podwójne "
-"kliknięcie na nich zaznacza je i dodaje do listy odtwarzania."
-
-#: src/wx-console/wxbrestorepanel.cpp:742
-#: src/wx-console/wxbrestorepanel.cpp:764
-msgid "bwx-console: unexpected restore question."
-msgstr "bwx-console: niespodziewane pytanie o odtwarzanie."
-
-#: src/wx-console/wxbrestorepanel.cpp:775
-msgid " files selected to be restored."
-msgstr " pliki zaznaczone do odtworzenia."
-
-#: src/wx-console/wxbrestorepanel.cpp:780
-msgid " file selected to be restored."
-msgstr " plik zaznaczony do odtworzenia."
-
-#: src/wx-console/wxbrestorepanel.cpp:787
-#, c-format
-msgid "Please configure your restore (%ld files selected to be restored)..."
-msgstr ""
-"Proszę skonfiguruj swoje odtwarzanie (%ld plików zaznaczonych do "
-"odtwarzania)..."
-
-#: src/wx-console/wxbrestorepanel.cpp:797
-msgid "Restore failed : no file selected.\n"
-msgstr "Nieudane odtwarzanie, nie wskazano pliku.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:798
-msgid "Restore failed : no file selected."
-msgstr "Nieudane odtwarzanie, nie wskazano pliku."
-
-#: src/wx-console/wxbrestorepanel.cpp:808
-msgid "Restoring, please wait..."
-msgstr "Odtwarzanie, proszę czekać..."
-
-#: src/wx-console/wxbrestorepanel.cpp:821
-msgid "Job queued. JobId="
-msgstr "Zadanie zakolejkowane. JobId="
-
-#: src/wx-console/wxbrestorepanel.cpp:823
-msgid "Restore queued, jobid="
-msgstr "Odtwarzanie zakolejkowane, jobid="
-
-#: src/wx-console/wxbrestorepanel.cpp:827
-msgid "Job failed."
-msgstr "Zadanie nieudane."
-
-#: src/wx-console/wxbrestorepanel.cpp:828
-msgid "Restore failed, please look at messages.\n"
-msgstr "Nieudane odtwarzanie, proszę zweryfikuj komunikaty.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:829
-msgid "Restore failed, please look at messages in console."
-msgstr "Odtwarzanie nieudane, proszę spojrzeć na komunikaty na konsoli."
-
-#: src/wx-console/wxbrestorepanel.cpp:835
-#: src/wx-console/wxbrestorepanel.cpp:836
-msgid "Failed to retrieve jobid.\n"
-msgstr "Nieudane pobranie jobid.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:862
-msgid ""
-"Restore is scheduled to run. bwx-console will not wait for its completion.\n"
-msgstr ""
-"Zadanie odtwarzania zaplanowane do uruchomienia. bwx-console nie będzie "
-"czekać na jego zakończenie.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:863
-msgid ""
-"Restore is scheduled to run. bwx-console will not wait for its completion."
-msgstr ""
-"Zadanie odtwarzania zaplanowane do uruchomienia. bwx-console nie będzie "
-"czekać na jego zakończenie."
-
-#: src/wx-console/wxbrestorepanel.cpp:889
-msgid "Restore job created, but not yet running."
-msgstr "Zadanie odtwarzania stworzone, lecz jeszcze nie uruchomione."
-
-#: src/wx-console/wxbrestorepanel.cpp:894
-msgid "Restore job running, please wait (%ld of %ld files restored)..."
-msgstr "Zadanie odtwarzania w trakcie, proszę czekać (%ld z %ld plików odtworzonych)..."
-
-#: src/wx-console/wxbrestorepanel.cpp:898
-msgid "Restore job terminated successfully."
-msgstr "Zadanie odtwarzania zakończone poprawnie."
-
-#: src/wx-console/wxbrestorepanel.cpp:899
-msgid "Restore job terminated successfully.\n"
-msgstr "Zadanie odtwarzania zakończone poprawnie.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:904
-msgid "Restore job terminated in error, see messages in console."
-msgstr "Zadanie odtwarzania zakończone z błędem, zobacz komunikaty na konsoli."
-
-#: src/wx-console/wxbrestorepanel.cpp:905
-msgid "Restore job terminated in error, see messages.\n"
-msgstr "Zadanie odtwarzania zakończone z błędem, zobacz komunikaty.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:910
-msgid "Restore job reported a non-fatal error."
-msgstr "Zadanie odtwarzania zaraportowało niekrytyczny błąd."
-
-#: src/wx-console/wxbrestorepanel.cpp:914
-msgid "Restore job reported a fatal error."
-msgstr "Zadanie odtwarzania zaraportowało błąd krytyczny."
-
-#: src/wx-console/wxbrestorepanel.cpp:919
-msgid "Restore job cancelled by user."
-msgstr "Zadanie odtwarzania anulowane przez użytkownika."
-
-#: src/wx-console/wxbrestorepanel.cpp:920
-msgid "Restore job cancelled by user.\n"
-msgstr "Zadanie odtwarzania anulowane przez użytkownika.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:925
-msgid "Restore job is waiting on File daemon."
-msgstr "Zadanie odtwarzania oczekuje na Demon Plików."
-
-#: src/wx-console/wxbrestorepanel.cpp:929
-msgid "Restore job is waiting for new media."
-msgstr "Zadanie odtwarzania oczekuje na nowe medium."
-
-#: src/wx-console/wxbrestorepanel.cpp:933
-msgid "Restore job is waiting for storage resource."
-msgstr "Zadanie odtwarzania oczekuje na zasoby storage."
-
-#: src/wx-console/wxbrestorepanel.cpp:937
-msgid "Restore job is waiting for job resource."
-msgstr "Zadanie odtwarzania oczekuje na zasoby dadania."
-
-#: src/wx-console/wxbrestorepanel.cpp:941
-msgid "Restore job is waiting for Client resource."
-msgstr "Zadanie odtwarzania oczekuje na zasoby Klienta."
-
-#: src/wx-console/wxbrestorepanel.cpp:945
-msgid "Restore job is waiting for maximum jobs."
-msgstr "Zadanie odtwarzania oczekuje z powodu maksymalnej iloiści zadań."
-
-#: src/wx-console/wxbrestorepanel.cpp:949
-msgid "Restore job is waiting for start time."
-msgstr "Zadanie odtwarzania oczekuje na czas uruchomienia."
-
-#: src/wx-console/wxbrestorepanel.cpp:953
-msgid "Restore job is waiting for higher priority jobs to finish."
-msgstr "Zadanie odtwarzania oczekuje na zakończenie zadań o wyższym priorytecie."
-
-#: src/wx-console/wxbrestorepanel.cpp:1002
-msgid ""
-"The restore job has not been started within one minute, bwx-console will not "
-"wait for its completion anymore.\n"
-msgstr ""
-"Zadanie odtwarzania nie wystartowało w ciągu minuty, bwx-console nie będzie "
-"już więcej czekać na jego zakończenie.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:1003
-msgid ""
-"The restore job has not been started within one minute, bwx-console will not "
-"wait for its completion anymore."
-msgstr ""
-"Zadanie odtwarzania nie wystartowało w ciągu minuty, bwx-console nie będzie "
-"już więcej czekać na jego zakończenie."
-
-#: src/wx-console/wxbrestorepanel.cpp:1013
-msgid "Restore done successfully.\n"
-msgstr "Odtwarzanie wykonane poprawnie.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:1014
-msgid "Restore done successfully."
-msgstr "Odtwarzanie wykonane poprawnie."
-
-#: src/wx-console/wxbrestorepanel.cpp:1086
-msgid "Applying restore configuration changes..."
-msgstr "Zastosowanie zmian konfiguracyjnych odtwarzania..."
-
-#: src/wx-console/wxbrestorepanel.cpp:1138
-msgid "Failed to find the selected client."
-msgstr "Nie można znaleźć wskazanego klienta."
-
-#: src/wx-console/wxbrestorepanel.cpp:1158
-msgid "Failed to find the selected fileset."
-msgstr "Nie można znaleźć wskazanego fileset."
-
-#: src/wx-console/wxbrestorepanel.cpp:1178
-msgid "Failed to find the selected storage."
-msgstr "Nie można znaleźć wskazanego storage."
-
-#: src/wx-console/wxbrestorepanel.cpp:1199
-#: src/wx-console/wxbrestorepanel.cpp:1886
-msgid "Run Restore job"
-msgstr "Uruchom zadanie Odtwarzania"
-
-#: src/wx-console/wxbrestorepanel.cpp:1216
-msgid "Restore configuration changes were applied."
-msgstr "Odtworzenie zmian konfiguracji zostało zastosowane."
-
-#: src/wx-console/wxbrestorepanel.cpp:1225
-msgid "Restore cancelled.\n"
-msgstr "Odtwarzanie anulowane.\n"
-
-#: src/wx-console/wxbrestorepanel.cpp:1226
-msgid "Restore cancelled."
-msgstr "Odtwarzanie anulowane."
-
-#: src/wx-console/wxbrestorepanel.cpp:1248
-msgid "No results to list."
-msgstr "Brak rezultatów do wylistowania."
-
-#: src/wx-console/wxbrestorepanel.cpp:1250
-msgid "No backup found for this client."
-msgstr "Nie znaleziono backupu dla tego klienta."
-
-#: src/wx-console/wxbrestorepanel.cpp:1257
-msgid "ERROR"
-msgstr "BŁĄD"
-
-#: src/wx-console/wxbrestorepanel.cpp:1258
-msgid "Query failed"
-msgstr "Nieudane zapytanie"
-
-#: src/wx-console/wxbrestorepanel.cpp:1260
-msgid "Cannot get previous backups list, see console."
-msgstr "Nie moąna otrzymać listy poprzednich backupów, zobacz konsolę."
-
-#: src/wx-console/wxbrestorepanel.cpp:1896
-msgid "JobName:"
-msgstr "Nazwa Zadania:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1898
-msgid "Bootstrap:"
-msgstr "Bootstrap:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1900
-msgid "Where:"
-msgstr "Gdzie:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1903
-msgid "Replace:"
-msgstr "Zamiana:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1906
-msgid "ifnewer"
-msgstr "ifnewer"
-
-#: src/wx-console/wxbrestorepanel.cpp:1907
-msgid "ifolder"
-msgstr "ifolder"
-
-#: src/wx-console/wxbrestorepanel.cpp:1911
-msgid "FileSet:"
-msgstr "FileSet:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1913
-msgid "Client:"
-msgstr "Klient:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1915
-msgid "Storage:"
-msgstr "Storage:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1917
-msgid "When:"
-msgstr "Kiedy:"
-
-#: src/wx-console/wxbrestorepanel.cpp:1920
-msgid "Priority:"
-msgstr "Priorytet:"
-
-#: src/wx-console/wxbrestorepanel.cpp:2028
-msgid "Restoring..."
-msgstr "Odtwarzanie..."
-
-#: src/wx-console/wxbhistorytextctrl.cpp:117
-msgid "Unknown command."
-msgstr "Nieznana komenda."
-
-#: src/wx-console/wxbhistorytextctrl.cpp:126
-msgid "Possible completions: "
-msgstr "Możliwe uzupełnienia: "
-
 #: src/qt-console/bat_conf.cpp:154
 msgid "Console: name=%s\n"
 msgstr "Konsola: nazwa=%s\n"
diff --git a/bacula/po/sv.po b/bacula/po/sv.po
index 9bbc437..780e45b 100644
--- a/bacula/po/sv.po
+++ b/bacula/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Bacula 2.1.x\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2014-03-23 22:51+0100\n"
+"POT-Creation-Date: 2014-03-30 20:55+0200\n"
 "PO-Revision-Date: 2007-06-22 19:18+0200\n"
 "Last-Translator: Kern Sibbald <kern@bacula.org>\n"
 "Language-Team: Swedish <bacula-devel@lists.soureforge.net>\n"
@@ -54,7 +54,7 @@ msgid ""
 "Please see "
 msgstr ""
 
-#: src/console/console_conf.c:128 src/qt-console/bat_conf.cpp:129
+#: src/console/console_conf.c:128 src/qt-console/bat_conf.cpp:130
 #, c-format
 msgid "No record for %d %s\n"
 msgstr ""
@@ -64,33 +64,33 @@ msgstr ""
 msgid "Console: name=%s rcfile=%s histfile=%s\n"
 msgstr ""
 
-#: src/console/console_conf.c:141 src/qt-console/bat_conf.cpp:138
+#: src/console/console_conf.c:141 src/qt-console/bat_conf.cpp:139
 #, c-format
 msgid "Director: name=%s address=%s DIRport=%d\n"
 msgstr ""
 
-#: src/console/console_conf.c:145 src/console/console_conf.c:221
-#: src/console/console_conf.c:266 src/console/console_conf.c:293
+#: src/console/console_conf.c:145 src/console/console_conf.c:224
+#: src/console/console_conf.c:269 src/console/console_conf.c:296
 #: src/stored/stored_conf.c:538 src/stored/stored_conf.c:628
 #: src/stored/stored_conf.c:663 src/filed/filed_conf.c:411
 #: src/filed/filed_conf.c:476 src/filed/filed_conf.c:506
-#: src/qt-console/bat_conf.cpp:149 src/qt-console/bat_conf.cpp:227
-#: src/qt-console/bat_conf.cpp:275 src/qt-console/bat_conf.cpp:305
+#: src/qt-console/bat_conf.cpp:150 src/qt-console/bat_conf.cpp:231
+#: src/qt-console/bat_conf.cpp:279 src/qt-console/bat_conf.cpp:309
 #, c-format
 msgid "Unknown resource type %d\n"
 msgstr ""
 
-#: src/console/console_conf.c:247 src/dird/dird_conf.c:1425
+#: src/console/console_conf.c:250 src/dird/dird_conf.c:1425
 #: src/dird/dird_conf.c:1440 src/filed/filed_conf.c:439
 #: src/qt-console/tray-monitor/tray_conf.cpp:276
-#: src/qt-console/bat_conf.cpp:253
+#: src/qt-console/bat_conf.cpp:257
 #, c-format
 msgid "%s item is required in %s resource, but not found.\n"
 msgstr ""
 
-#: src/console/console_conf.c:310 src/dird/dird_conf.c:1664
+#: src/console/console_conf.c:313 src/dird/dird_conf.c:1664
 #: src/filed/filed_conf.c:524 src/qt-console/tray-monitor/tray_conf.cpp:360
-#: src/qt-console/bat_conf.cpp:322
+#: src/qt-console/bat_conf.cpp:326
 #, c-format
 msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
 msgstr ""
@@ -194,38 +194,38 @@ msgstr ""
 msgid "You must enter a number between 1 and %d\n"
 msgstr ""
 
-#: src/console/console.c:1095 src/stored/stored.c:215 src/dird/dird.c:267
+#: src/console/console.c:1101 src/stored/stored.c:215 src/dird/dird.c:267
 #: src/filed/filed.c:204 src/qt-console/main.cpp:154
 msgid "Cryptography library initialization failed.\n"
 msgstr ""
 
-#: src/console/console.c:1099 src/stored/stored.c:219 src/dird/dird.c:271
+#: src/console/console.c:1105 src/stored/stored.c:219 src/dird/dird.c:271
 #: src/dird/dird.c:299 src/dird/dird.c:517 src/dird/dird.c:520
 #: src/filed/filed.c:209 src/qt-console/main.cpp:158
 #, c-format
 msgid "Please correct configuration file: %s\n"
 msgstr ""
 
-#: src/console/console.c:1129
+#: src/console/console.c:1136
 #, c-format
 msgid "Connecting to Director %s:%d\n"
 msgstr ""
 
-#: src/console/console.c:1146 src/qt-console/bcomm/dircomm.cpp:118
+#: src/console/console.c:1153 src/qt-console/bcomm/dircomm.cpp:150
 #, c-format
 msgid "Failed to initialize TLS context for Console \"%s\".\n"
 msgstr ""
 
-#: src/console/console.c:1166 src/qt-console/bcomm/dircomm.cpp:141
+#: src/console/console.c:1173 src/qt-console/bcomm/dircomm.cpp:173
 #, c-format
 msgid "Failed to initialize TLS context for Director \"%s\".\n"
 msgstr ""
 
-#: src/console/console.c:1198
+#: src/console/console.c:1205
 msgid "Enter a period to cancel a command.\n"
 msgstr ""
 
-#: src/console/console.c:1284 src/console/console.c:1314
+#: src/console/console.c:1291 src/console/console.c:1321
 #: src/stored/stored.c:342 src/dird/dird.c:607 src/dird/dird.c:813
 #: src/dird/dird.c:868 src/dird/dird.c:907 src/filed/filed.c:366
 #: src/filed/filed.c:566 src/qt-console/main.cpp:213
@@ -233,59 +233,59 @@ msgstr ""
 msgid "TLS required but not configured in Bacula.\n"
 msgstr ""
 
-#: src/console/console.c:1292 src/qt-console/main.cpp:221
+#: src/console/console.c:1299 src/qt-console/main.cpp:221
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Director \"%s\" in %s. At least one CA certificate store is required.\n"
 msgstr ""
 
-#: src/console/console.c:1301 src/qt-console/main.cpp:230
+#: src/console/console.c:1308 src/qt-console/main.cpp:230
 #, c-format
 msgid ""
 "No Director resource defined in %s\n"
 "Without that I don't how to speak to the Director :-(\n"
 msgstr ""
 
-#: src/console/console.c:1321 src/qt-console/main.cpp:251
+#: src/console/console.c:1328 src/qt-console/main.cpp:251
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Console \"%s\" in %s.\n"
 msgstr ""
 
-#: src/console/console.c:1347
+#: src/console/console.c:1354
 msgid "Too many arguments on input command.\n"
 msgstr ""
 
-#: src/console/console.c:1351
+#: src/console/console.c:1358
 msgid "First argument to input command must be a filename.\n"
 msgstr ""
 
-#: src/console/console.c:1357
+#: src/console/console.c:1364
 #, c-format
 msgid "Cannot open file %s for input. ERR=%s\n"
 msgstr ""
 
-#: src/console/console.c:1389
+#: src/console/console.c:1396
 msgid "Too many arguments on output/tee command.\n"
 msgstr ""
 
-#: src/console/console.c:1406
+#: src/console/console.c:1413
 #, c-format
 msgid "Cannot open file %s for output. ERR=%s\n"
 msgstr ""
 
-#: src/console/console.c:1425
+#: src/console/console.c:1432
 msgid "Too many arguments. Enclose command in double quotes.\n"
 msgstr ""
 
-#: src/console/console.c:1434
+#: src/console/console.c:1441
 #, c-format
 msgid "Cannot popen(\"%s\", \"r\"): ERR=%s\n"
 msgstr ""
 
-#: src/console/console.c:1446 src/stored/autochanger.c:665
+#: src/console/console.c:1453 src/stored/autochanger.c:665
 #, c-format
 msgid "Autochanger error: ERR=%s\n"
 msgstr ""
@@ -4129,7 +4129,7 @@ msgid "Bad storage command: %s"
 msgstr ""
 
 #: src/stored/dircmd.c:377 src/dird/msgchan.c:121 src/filed/job.c:1880
-#: src/qt-console/tray-monitor/tray-monitor.cpp:363
+#: src/qt-console/tray-monitor/tray-monitor.cpp:372
 msgid "Storage daemon"
 msgstr ""
 
@@ -5004,17 +5004,17 @@ msgstr ""
 msgid "Cannot free Volume \"%s\", because it is reserved by someone else.\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:512
+#: src/stored/vol_mgr.c:514
 #, c-format
 msgid "Volume %s is busy swapping from %s to %s\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:515
+#: src/stored/vol_mgr.c:517
 #, c-format
 msgid "Volume %s is busy swapping.\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:519
+#: src/stored/vol_mgr.c:521
 #, c-format
 msgid "%s device %s is busy.\n"
 msgstr ""
@@ -6600,30 +6600,30 @@ msgstr ""
 msgid "NULL jcr.\n"
 msgstr ""
 
-#: src/lib/jcr.c:496
+#: src/lib/jcr.c:495
 #, c-format
 msgid "JCR use_count=%d JobId=%d\n"
 msgstr ""
 
-#: src/lib/jcr.c:601
+#: src/lib/jcr.c:600
 #, c-format
 msgid "pthread_setspecific failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/jcr.c:1082
+#: src/lib/jcr.c:1081
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Storage "
 "daemon.\n"
 msgstr ""
 
-#: src/lib/jcr.c:1094
+#: src/lib/jcr.c:1093
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading File daemon.\n"
 msgstr ""
 
-#: src/lib/jcr.c:1106
+#: src/lib/jcr.c:1105
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Director.\n"
@@ -6652,98 +6652,98 @@ msgstr ""
 msgid "Close of NULL file\n"
 msgstr ""
 
-#: src/lib/lex.c:212
+#: src/lib/lex.c:215
 msgid ""
 "get_char: called after EOF. You may have a open double quote without the "
 "closing double quote.\n"
 msgstr ""
 
-#: src/lib/lex.c:254
+#: src/lib/lex.c:257
 #, c-format
 msgid "Config token too long, file: %s, line %d, begins at line %d\n"
 msgstr ""
 
-#: src/lib/lex.c:278
+#: src/lib/lex.c:281
 msgid "none"
 msgstr ""
 
-#: src/lib/lex.c:279
+#: src/lib/lex.c:282
 msgid "comment"
 msgstr ""
 
-#: src/lib/lex.c:280
+#: src/lib/lex.c:283
 msgid "number"
 msgstr ""
 
-#: src/lib/lex.c:281
+#: src/lib/lex.c:284
 msgid "ip_addr"
 msgstr ""
 
-#: src/lib/lex.c:282
+#: src/lib/lex.c:285
 msgid "identifier"
 msgstr ""
 
-#: src/lib/lex.c:283
+#: src/lib/lex.c:286
 msgid "string"
 msgstr ""
 
-#: src/lib/lex.c:284
+#: src/lib/lex.c:287
 msgid "quoted_string"
 msgstr ""
 
-#: src/lib/lex.c:285
+#: src/lib/lex.c:288
 msgid "include"
 msgstr ""
 
-#: src/lib/lex.c:286
+#: src/lib/lex.c:289
 msgid "include_quoted_string"
 msgstr ""
 
-#: src/lib/lex.c:287
+#: src/lib/lex.c:290
 msgid "UTF-8 Byte Order Mark"
 msgstr ""
 
-#: src/lib/lex.c:288
+#: src/lib/lex.c:291
 msgid "UTF-16le Byte Order Mark"
 msgstr ""
 
-#: src/lib/lex.c:326 src/lib/lex.c:332 src/lib/lex.c:343 src/lib/lex.c:349
+#: src/lib/lex.c:329 src/lib/lex.c:335 src/lib/lex.c:346 src/lib/lex.c:352
 #, c-format
 msgid "expected a positive integer number, got: %s"
 msgstr ""
 
-#: src/lib/lex.c:465
+#: src/lib/lex.c:468
 msgid ""
 "This config file appears to be in an unsupported Unicode format (UTF-16be). "
 "Please resave as UTF-8\n"
 msgstr ""
 
-#: src/lib/lex.c:611 src/lib/lex.c:639
+#: src/lib/lex.c:614 src/lib/lex.c:642
 #, c-format
 msgid "Cannot open included config file %s: %s\n"
 msgstr ""
 
-#: src/lib/lex.c:698 src/lib/lex.c:755
+#: src/lib/lex.c:701 src/lib/lex.c:758
 #, c-format
 msgid "expected an integer or a range, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:712 src/lib/lex.c:720 src/lib/lex.c:731 src/lib/lex.c:739
+#: src/lib/lex.c:715 src/lib/lex.c:723 src/lib/lex.c:734 src/lib/lex.c:742
 #, c-format
 msgid "expected an integer number, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:769
+#: src/lib/lex.c:772
 #, c-format
 msgid "expected a name, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:773
+#: src/lib/lex.c:776
 #, c-format
 msgid "name %s length %d too long, max is %d\n"
 msgstr ""
 
-#: src/lib/lex.c:781
+#: src/lib/lex.c:784
 #, c-format
 msgid "expected a string, got %s: %s"
 msgstr ""
@@ -8320,8 +8320,7 @@ msgstr ""
 msgid "Could not add job queue: ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:121 src/dird/ua_output.c:714 src/dird/xua_output.c:869
-#: src/tools/cats_test.c:363
+#: src/dird/job.c:121 src/dird/ua_output.c:714 src/tools/cats_test.c:363
 #, c-format
 msgid "Could not open database \"%s\".\n"
 msgstr ""
@@ -8611,16 +8610,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/ua_output.c:57 src/dird/ua_output.c:81 src/dird/xua_output.c:56
-#: src/dird/xua_output.c:80
+#: src/dird/ua_output.c:57 src/dird/ua_output.c:81
 msgid "ON or OFF keyword missing.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:101 src/dird/xua_output.c:100
+#: src/dird/ua_output.c:101
 msgid "Disabled Jobs:\n"
 msgstr ""
 
-#: src/dird/ua_output.c:107 src/dird/xua_output.c:106
+#: src/dird/ua_output.c:107
 msgid "No disabled Jobs.\n"
 msgstr ""
 
@@ -8628,94 +8626,93 @@ msgstr ""
 msgid "disabled"
 msgstr ""
 
-#: src/dird/ua_output.c:199 src/dird/xua_output.c:204
+#: src/dird/ua_output.c:199
 msgid "Keywords for the show command are:\n"
 msgstr ""
 
-#: src/dird/ua_output.c:205 src/dird/xua_output.c:211
+#: src/dird/ua_output.c:205
 #, c-format
 msgid "%s resource %s not found.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:208 src/dird/xua_output.c:215
+#: src/dird/ua_output.c:208
 #, c-format
 msgid "Resource %s not found\n"
 msgstr ""
 
-#: src/dird/ua_output.c:278 src/dird/xua_output.c:356
+#: src/dird/ua_output.c:278
 msgid "Hey! DB is NULL\n"
 msgstr ""
 
-#: src/dird/ua_output.c:435 src/dird/xua_output.c:590
+#: src/dird/ua_output.c:435
 #, c-format
 msgid "Jobid %d used %d Volume(s): %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:454 src/dird/xua_output.c:609
+#: src/dird/ua_output.c:454
 msgid "No Pool specified.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:465 src/dird/ua_select.c:531 src/dird/xua_output.c:620
-#: src/dird/ua_update.c:424
+#: src/dird/ua_output.c:465 src/dird/ua_select.c:531 src/dird/ua_update.c:424
 #, c-format
 msgid "Error obtaining pool ids. ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:475 src/dird/xua_output.c:630
+#: src/dird/ua_output.c:475
 #, c-format
 msgid "Pool: %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:491 src/dird/xua_output.c:646
+#: src/dird/ua_output.c:491
 msgid "Ignoring invalid value for days. Max is 50.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:513 src/dird/xua_output.c:668
+#: src/dird/ua_output.c:513
 #, c-format
 msgid "Unknown list keyword: %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:538 src/dird/xua_output.c:693
+#: src/dird/ua_output.c:538
 #, c-format
 msgid "%s is not a job name.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:552 src/dird/xua_output.c:707
+#: src/dird/ua_output.c:552
 #, c-format
 msgid "Could not find Pool for Job %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:565 src/dird/xua_output.c:720
+#: src/dird/ua_output.c:565
 #, c-format
 msgid "Could not find next Volume for Job %s (Pool=%s, Level=%s).\n"
 msgstr ""
 
-#: src/dird/ua_output.c:569 src/dird/xua_output.c:724
+#: src/dird/ua_output.c:569
 #, c-format
 msgid ""
 "The next Volume to be used by Job \"%s\" (Pool=%s, Level=%s) will be %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:582 src/dird/xua_output.c:737
+#: src/dird/ua_output.c:582
 #, c-format
 msgid "Could not find next Volume for Job %s.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:727 src/dird/xua_output.c:882
+#: src/dird/ua_output.c:727
 #, c-format
 msgid "Pool %s not in database. %s"
 msgstr ""
 
-#: src/dird/ua_output.c:735 src/dird/xua_output.c:890
+#: src/dird/ua_output.c:735
 #, c-format
 msgid "Pool %s created in database.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:788 src/dird/xua_output.c:943
+#: src/dird/ua_output.c:788
 msgid "You have no messages.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:868 src/dird/xua_output.c:1023
+#: src/dird/ua_output.c:868
 msgid "Message too long to display.\n"
 msgstr ""
 
@@ -12707,19 +12704,6 @@ msgstr ""
 msgid "Director's connection to SD for this Job was lost.\n"
 msgstr ""
 
-#: src/dird/xua_output.c:518
-msgid "Invalid jobid argument\n"
-msgstr ""
-
-#: src/dird/xua_output.c:542
-#, c-format
-msgid "Unknown ObjectType %s\n"
-msgstr ""
-
-#: src/dird/xua_output.c:552
-msgid "list pluginrestoreconf requires jobid argument\n"
-msgstr ""
-
 #: src/dird/getmsg.c:160
 #, c-format
 msgid "bget_dirmsg: unknown bnet signal %d\n"
@@ -16668,7 +16652,7 @@ msgstr ""
 msgid "DROP-Stmt went wrong\n"
 msgstr ""
 
-#: examples/nagios/check_bacula/check_bacula.c:59
+#: examples/nagios/check_bacula/check_bacula.c:57
 #, c-format
 msgid ""
 "Copyright (C) 2005 Christian Masopust\n"
@@ -16686,58 +16670,58 @@ msgstr ""
 msgid "Failed ASSERT: %s\n"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:79
+#: src/qt-console/bcomm/dircomm.cpp:85
 #, c-format
 msgid "Already connected\"%s\".\n"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:90
+#: src/qt-console/bcomm/dircomm.cpp:96
 #: src/qt-console/tray-monitor/tray-monitor.cpp:347
 #, c-format
 msgid "Connecting to Director %s:%d"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:92
+#: src/qt-console/bcomm/dircomm.cpp:98
 #, c-format
 msgid ""
 "Connecting to Director %s:%d\n"
 "\n"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:163
-#: src/qt-console/tray-monitor/tray-monitor.cpp:349
+#: src/qt-console/bcomm/dircomm.cpp:195
+#: src/qt-console/tray-monitor/tray-monitor.cpp:352
 msgid "Director daemon"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:201
+#: src/qt-console/bcomm/dircomm.cpp:233
 msgid "Initializing ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:217 src/qt-console/console/console.cpp:130
+#: src/qt-console/bcomm/dircomm.cpp:249 src/qt-console/console/console.cpp:130
 msgid "Connected"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:341
+#: src/qt-console/bcomm/dircomm.cpp:373
 msgid "Command completed ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:348 src/qt-console/console/console.cpp:367
+#: src/qt-console/bcomm/dircomm.cpp:380 src/qt-console/console/console.cpp:367
 msgid "Processing command ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:355
+#: src/qt-console/bcomm/dircomm.cpp:387
 msgid "At main prompt waiting for input ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:362 src/qt-console/bcomm/dircomm.cpp:375
+#: src/qt-console/bcomm/dircomm.cpp:394 src/qt-console/bcomm/dircomm.cpp:407
 msgid "At prompt waiting for input ..."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:383
+#: src/qt-console/bcomm/dircomm.cpp:415
 msgid "Command failed."
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:455
+#: src/qt-console/bcomm/dircomm.cpp:487
 msgid "Director disconnected."
 msgstr ""
 
@@ -16762,7 +16746,7 @@ msgid "Storage: name=%s address=%s SDport=%d\n"
 msgstr ""
 
 #: src/qt-console/tray-monitor/tray_conf.cpp:183
-#: src/qt-console/bat_conf.cpp:145
+#: src/qt-console/bat_conf.cpp:146
 #, c-format
 msgid "ConsoleFont: name=%s font face=%s\n"
 msgstr ""
@@ -16810,52 +16794,52 @@ msgstr ""
 msgid "Error, currentitem is not a Client or a Storage..\n"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:354
+#: src/qt-console/tray-monitor/tray-monitor.cpp:357
 #, c-format
 msgid "Connecting to Client %s:%d"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:356
+#: src/qt-console/tray-monitor/tray-monitor.cpp:362
 msgid "File daemon"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:361
+#: src/qt-console/tray-monitor/tray-monitor.cpp:367
 #, c-format
 msgid "Connecting to Storage %s:%d"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:367
-#: src/qt-console/tray-monitor/tray-monitor.cpp:397
+#: src/qt-console/tray-monitor/tray-monitor.cpp:376
+#: src/qt-console/tray-monitor/tray-monitor.cpp:406
 #, c-format
 msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:372
+#: src/qt-console/tray-monitor/tray-monitor.cpp:381
 msgid "Cannot connect to daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:381
+#: src/qt-console/tray-monitor/tray-monitor.cpp:390
 #, c-format
 msgid "Authentication error : %s"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:388
+#: src/qt-console/tray-monitor/tray-monitor.cpp:397
 msgid "Opened connection with Director daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:391
+#: src/qt-console/tray-monitor/tray-monitor.cpp:400
 msgid "Opened connection with File daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:394
+#: src/qt-console/tray-monitor/tray-monitor.cpp:403
 msgid "Opened connection with Storage daemon."
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:445
+#: src/qt-console/tray-monitor/tray-monitor.cpp:454
 msgid "Error : BNET_HARDEOF or BNET_ERROR"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:454
+#: src/qt-console/tray-monitor/tray-monitor.cpp:463
 msgid "Error : Connection closed."
 msgstr ""
 
@@ -16903,7 +16887,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/qt-console/bat_conf.cpp:142
+#: src/qt-console/bat_conf.cpp:143
 #, c-format
 msgid "Console: name=%s\n"
 msgstr ""
diff --git a/bacula/po/uk.po b/bacula/po/uk.po
index 2f90e0f..f260eec 100644
--- a/bacula/po/uk.po
+++ b/bacula/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bacula 5.0.3\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2014-03-23 22:51+0100\n"
+"POT-Creation-Date: 2014-03-30 20:55+0200\n"
 "PO-Revision-Date: 2010-01-08 17:32+0300\n"
 "Last-Translator: Vitaliy Kosharskiy <kisa_co@ukrpost.net>\n"
 "Language-Team: Ukrainian\n"
@@ -65,7 +65,7 @@ msgstr ""
 "Для отримання допомоги, будь ласка, перегляньте http://www.bacula.org/en/rel-"
 "manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000.\n"
 
-#: src/console/console_conf.c:128 src/qt-console/bat_conf.cpp:129
+#: src/console/console_conf.c:128 src/qt-console/bat_conf.cpp:130
 #, c-format
 msgid "No record for %d %s\n"
 msgstr "Відсутні записи для %d %s\n"
@@ -75,33 +75,33 @@ msgstr "Відсутні записи для %d %s\n"
 msgid "Console: name=%s rcfile=%s histfile=%s\n"
 msgstr "Консоль: назва=%s rcfile=%s histfile=%s\n"
 
-#: src/console/console_conf.c:141 src/qt-console/bat_conf.cpp:138
+#: src/console/console_conf.c:141 src/qt-console/bat_conf.cpp:139
 #, c-format
 msgid "Director: name=%s address=%s DIRport=%d\n"
 msgstr "Керівник: назва=%s адреса=%s DIRport=%d\n"
 
-#: src/console/console_conf.c:145 src/console/console_conf.c:221
-#: src/console/console_conf.c:266 src/console/console_conf.c:293
+#: src/console/console_conf.c:145 src/console/console_conf.c:224
+#: src/console/console_conf.c:269 src/console/console_conf.c:296
 #: src/stored/stored_conf.c:538 src/stored/stored_conf.c:628
 #: src/stored/stored_conf.c:663 src/filed/filed_conf.c:411
 #: src/filed/filed_conf.c:476 src/filed/filed_conf.c:506
-#: src/qt-console/bat_conf.cpp:149 src/qt-console/bat_conf.cpp:227
-#: src/qt-console/bat_conf.cpp:275 src/qt-console/bat_conf.cpp:305
+#: src/qt-console/bat_conf.cpp:150 src/qt-console/bat_conf.cpp:231
+#: src/qt-console/bat_conf.cpp:279 src/qt-console/bat_conf.cpp:309
 #, c-format
 msgid "Unknown resource type %d\n"
 msgstr "Невідомий тип ресурсу %d\n"
 
-#: src/console/console_conf.c:247 src/dird/dird_conf.c:1425
+#: src/console/console_conf.c:250 src/dird/dird_conf.c:1425
 #: src/dird/dird_conf.c:1440 src/filed/filed_conf.c:439
 #: src/qt-console/tray-monitor/tray_conf.cpp:276
-#: src/qt-console/bat_conf.cpp:253
+#: src/qt-console/bat_conf.cpp:257
 #, c-format
 msgid "%s item is required in %s resource, but not found.\n"
 msgstr "Не знайдено необхідний елемент %s для ресурсу %s.\n"
 
-#: src/console/console_conf.c:310 src/dird/dird_conf.c:1664
+#: src/console/console_conf.c:313 src/dird/dird_conf.c:1664
 #: src/filed/filed_conf.c:524 src/qt-console/tray-monitor/tray_conf.cpp:360
-#: src/qt-console/bat_conf.cpp:322
+#: src/qt-console/bat_conf.cpp:326
 #, c-format
 msgid "Attempt to define second %s resource named \"%s\" is not permitted.\n"
 msgstr "Спроба визначити другий %s ресурс із назвою \"%s\" не дозволяється.\n"
@@ -207,38 +207,38 @@ msgstr "%s не є номером. Ви повинні увести номер 
 msgid "You must enter a number between 1 and %d\n"
 msgstr "Ви повинні увести номер із проміжку 1..%d\n"
 
-#: src/console/console.c:1095 src/stored/stored.c:215 src/dird/dird.c:267
+#: src/console/console.c:1101 src/stored/stored.c:215 src/dird/dird.c:267
 #: src/filed/filed.c:204 src/qt-console/main.cpp:154
 msgid "Cryptography library initialization failed.\n"
 msgstr "Ініціалізація криптографії невдала.\n"
 
-#: src/console/console.c:1099 src/stored/stored.c:219 src/dird/dird.c:271
+#: src/console/console.c:1105 src/stored/stored.c:219 src/dird/dird.c:271
 #: src/dird/dird.c:299 src/dird/dird.c:517 src/dird/dird.c:520
 #: src/filed/filed.c:209 src/qt-console/main.cpp:158
 #, c-format
 msgid "Please correct configuration file: %s\n"
 msgstr "Будьласка виправте файл конфігурації: %s\n"
 
-#: src/console/console.c:1129
+#: src/console/console.c:1136
 #, c-format
 msgid "Connecting to Director %s:%d\n"
 msgstr "Підключаюсь до Керівника %s:%d\n"
 
-#: src/console/console.c:1146 src/qt-console/bcomm/dircomm.cpp:118
+#: src/console/console.c:1153 src/qt-console/bcomm/dircomm.cpp:150
 #, c-format
 msgid "Failed to initialize TLS context for Console \"%s\".\n"
 msgstr "Ініціалізація контексту TLS для Консолі невдала \"%s\".\n"
 
-#: src/console/console.c:1166 src/qt-console/bcomm/dircomm.cpp:141
+#: src/console/console.c:1173 src/qt-console/bcomm/dircomm.cpp:173
 #, c-format
 msgid "Failed to initialize TLS context for Director \"%s\".\n"
 msgstr "Ініціалізація контексту TLS для Керівника невдала \"%s\".\n"
 
-#: src/console/console.c:1198
+#: src/console/console.c:1205
 msgid "Enter a period to cancel a command.\n"
 msgstr "Уведіть цятку для переривання команди.\n"
 
-#: src/console/console.c:1284 src/console/console.c:1314
+#: src/console/console.c:1291 src/console/console.c:1321
 #: src/stored/stored.c:342 src/dird/dird.c:607 src/dird/dird.c:813
 #: src/dird/dird.c:868 src/dird/dird.c:907 src/filed/filed.c:366
 #: src/filed/filed.c:566 src/qt-console/main.cpp:213
@@ -246,7 +246,7 @@ msgstr "Уведіть цятку для переривання команди.\
 msgid "TLS required but not configured in Bacula.\n"
 msgstr "TLS необхідний, але не налаштовано у Bacula.\n"
 
-#: src/console/console.c:1292 src/qt-console/main.cpp:221
+#: src/console/console.c:1299 src/qt-console/main.cpp:221
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -256,7 +256,7 @@ msgstr ""
 "задано для Керівника \"%s\" у %s. Необхідне щонайменше одне сховище для "
 "сертифікату CA.\n"
 
-#: src/console/console.c:1301 src/qt-console/main.cpp:230
+#: src/console/console.c:1308 src/qt-console/main.cpp:230
 #, c-format
 msgid ""
 "No Director resource defined in %s\n"
@@ -265,7 +265,7 @@ msgstr ""
 "У %s не задано ресурсу Керівника\n"
 "Без цього я не знаю як спілкуватись із Керівником :-(\n"
 
-#: src/console/console.c:1321 src/qt-console/main.cpp:251
+#: src/console/console.c:1328 src/qt-console/main.cpp:251
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -274,38 +274,38 @@ msgstr ""
 "Жоден із параметрів \"TLS CA Certificate\" або \"TLS CA Certificate Dir\" не "
 "задано для Консолі \"%s\" у %s.\n"
 
-#: src/console/console.c:1347
+#: src/console/console.c:1354
 msgid "Too many arguments on input command.\n"
 msgstr "Забагато параметрів команди.\n"
 
-#: src/console/console.c:1351
+#: src/console/console.c:1358
 msgid "First argument to input command must be a filename.\n"
 msgstr "Перший параметр команди повинен бути назвою файлу.\n"
 
-#: src/console/console.c:1357
+#: src/console/console.c:1364
 #, c-format
 msgid "Cannot open file %s for input. ERR=%s\n"
 msgstr "Не вдається відкрити файл %s для введення. ERR=%s\n"
 
-#: src/console/console.c:1389
+#: src/console/console.c:1396
 msgid "Too many arguments on output/tee command.\n"
 msgstr "Забагато параметрів на виході команди.\n"
 
-#: src/console/console.c:1406
+#: src/console/console.c:1413
 #, c-format
 msgid "Cannot open file %s for output. ERR=%s\n"
 msgstr "Не вдається відкрити файл %s для виведення. ERR=%s\n"
 
-#: src/console/console.c:1425
+#: src/console/console.c:1432
 msgid "Too many arguments. Enclose command in double quotes.\n"
 msgstr "Забагато параметрів. Оточіть комінду подвійними лапками.\n"
 
-#: src/console/console.c:1434
+#: src/console/console.c:1441
 #, c-format
 msgid "Cannot popen(\"%s\", \"r\"): ERR=%s\n"
 msgstr ""
 
-#: src/console/console.c:1446 src/stored/autochanger.c:665
+#: src/console/console.c:1453 src/stored/autochanger.c:665
 #, c-format
 msgid "Autochanger error: ERR=%s\n"
 msgstr ""
@@ -4164,7 +4164,7 @@ msgid "Bad storage command: %s"
 msgstr ""
 
 #: src/stored/dircmd.c:377 src/dird/msgchan.c:121 src/filed/job.c:1880
-#: src/qt-console/tray-monitor/tray-monitor.cpp:363
+#: src/qt-console/tray-monitor/tray-monitor.cpp:372
 msgid "Storage daemon"
 msgstr "Зберігач"
 
@@ -5040,17 +5040,17 @@ msgstr ""
 msgid "Cannot free Volume \"%s\", because it is reserved by someone else.\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:512
+#: src/stored/vol_mgr.c:514
 #, c-format
 msgid "Volume %s is busy swapping from %s to %s\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:515
+#: src/stored/vol_mgr.c:517
 #, c-format
 msgid "Volume %s is busy swapping.\n"
 msgstr ""
 
-#: src/stored/vol_mgr.c:519
+#: src/stored/vol_mgr.c:521
 #, c-format
 msgid "%s device %s is busy.\n"
 msgstr ""
@@ -6637,30 +6637,30 @@ msgstr "Не вдалось відкрити%s: ERR=%s\n"
 msgid "NULL jcr.\n"
 msgstr ""
 
-#: src/lib/jcr.c:496
+#: src/lib/jcr.c:495
 #, c-format
 msgid "JCR use_count=%d JobId=%d\n"
 msgstr ""
 
-#: src/lib/jcr.c:601
+#: src/lib/jcr.c:600
 #, c-format
 msgid "pthread_setspecific failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/jcr.c:1082
+#: src/lib/jcr.c:1081
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Storage "
 "daemon.\n"
 msgstr ""
 
-#: src/lib/jcr.c:1094
+#: src/lib/jcr.c:1093
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading File daemon.\n"
 msgstr ""
 
-#: src/lib/jcr.c:1106
+#: src/lib/jcr.c:1105
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Director.\n"
@@ -6689,98 +6689,98 @@ msgstr ""
 msgid "Close of NULL file\n"
 msgstr ""
 
-#: src/lib/lex.c:212
+#: src/lib/lex.c:215
 msgid ""
 "get_char: called after EOF. You may have a open double quote without the "
 "closing double quote.\n"
 msgstr ""
 
-#: src/lib/lex.c:254
+#: src/lib/lex.c:257
 #, c-format
 msgid "Config token too long, file: %s, line %d, begins at line %d\n"
 msgstr ""
 
-#: src/lib/lex.c:278
+#: src/lib/lex.c:281
 msgid "none"
 msgstr ""
 
-#: src/lib/lex.c:279
+#: src/lib/lex.c:282
 msgid "comment"
 msgstr ""
 
-#: src/lib/lex.c:280
+#: src/lib/lex.c:283
 msgid "number"
 msgstr ""
 
-#: src/lib/lex.c:281
+#: src/lib/lex.c:284
 msgid "ip_addr"
 msgstr ""
 
-#: src/lib/lex.c:282
+#: src/lib/lex.c:285
 msgid "identifier"
 msgstr ""
 
-#: src/lib/lex.c:283
+#: src/lib/lex.c:286
 msgid "string"
 msgstr ""
 
-#: src/lib/lex.c:284
+#: src/lib/lex.c:287
 msgid "quoted_string"
 msgstr ""
 
-#: src/lib/lex.c:285
+#: src/lib/lex.c:288
 msgid "include"
 msgstr ""
 
-#: src/lib/lex.c:286
+#: src/lib/lex.c:289
 msgid "include_quoted_string"
 msgstr ""
 
-#: src/lib/lex.c:287
+#: src/lib/lex.c:290
 msgid "UTF-8 Byte Order Mark"
 msgstr ""
 
-#: src/lib/lex.c:288
+#: src/lib/lex.c:291
 msgid "UTF-16le Byte Order Mark"
 msgstr ""
 
-#: src/lib/lex.c:326 src/lib/lex.c:332 src/lib/lex.c:343 src/lib/lex.c:349
+#: src/lib/lex.c:329 src/lib/lex.c:335 src/lib/lex.c:346 src/lib/lex.c:352
 #, c-format
 msgid "expected a positive integer number, got: %s"
 msgstr ""
 
-#: src/lib/lex.c:465
+#: src/lib/lex.c:468
 msgid ""
 "This config file appears to be in an unsupported Unicode format (UTF-16be). "
 "Please resave as UTF-8\n"
 msgstr ""
 
-#: src/lib/lex.c:611 src/lib/lex.c:639
+#: src/lib/lex.c:614 src/lib/lex.c:642
 #, c-format
 msgid "Cannot open included config file %s: %s\n"
 msgstr ""
 
-#: src/lib/lex.c:698 src/lib/lex.c:755
+#: src/lib/lex.c:701 src/lib/lex.c:758
 #, c-format
 msgid "expected an integer or a range, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:712 src/lib/lex.c:720 src/lib/lex.c:731 src/lib/lex.c:739
+#: src/lib/lex.c:715 src/lib/lex.c:723 src/lib/lex.c:734 src/lib/lex.c:742
 #, c-format
 msgid "expected an integer number, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:769
+#: src/lib/lex.c:772
 #, c-format
 msgid "expected a name, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:773
+#: src/lib/lex.c:776
 #, c-format
 msgid "name %s length %d too long, max is %d\n"
 msgstr ""
 
-#: src/lib/lex.c:781
+#: src/lib/lex.c:784
 #, c-format
 msgid "expected a string, got %s: %s"
 msgstr ""
@@ -8368,8 +8368,7 @@ msgstr ""
 msgid "Could not add job queue: ERR=%s\n"
 msgstr ""
 
-#: src/dird/job.c:121 src/dird/ua_output.c:714 src/dird/xua_output.c:869
-#: src/tools/cats_test.c:363
+#: src/dird/job.c:121 src/dird/ua_output.c:714 src/tools/cats_test.c:363
 #, c-format
 msgid "Could not open database \"%s\".\n"
 msgstr ""
@@ -8661,16 +8660,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dird/ua_output.c:57 src/dird/ua_output.c:81 src/dird/xua_output.c:56
-#: src/dird/xua_output.c:80
+#: src/dird/ua_output.c:57 src/dird/ua_output.c:81
 msgid "ON or OFF keyword missing.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:101 src/dird/xua_output.c:100
+#: src/dird/ua_output.c:101
 msgid "Disabled Jobs:\n"
 msgstr ""
 
-#: src/dird/ua_output.c:107 src/dird/xua_output.c:106
+#: src/dird/ua_output.c:107
 msgid "No disabled Jobs.\n"
 msgstr ""
 
@@ -8678,94 +8676,93 @@ msgstr ""
 msgid "disabled"
 msgstr ""
 
-#: src/dird/ua_output.c:199 src/dird/xua_output.c:204
+#: src/dird/ua_output.c:199
 msgid "Keywords for the show command are:\n"
 msgstr ""
 
-#: src/dird/ua_output.c:205 src/dird/xua_output.c:211
+#: src/dird/ua_output.c:205
 #, c-format
 msgid "%s resource %s not found.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:208 src/dird/xua_output.c:215
+#: src/dird/ua_output.c:208
 #, c-format
 msgid "Resource %s not found\n"
 msgstr ""
 
-#: src/dird/ua_output.c:278 src/dird/xua_output.c:356
+#: src/dird/ua_output.c:278
 msgid "Hey! DB is NULL\n"
 msgstr ""
 
-#: src/dird/ua_output.c:435 src/dird/xua_output.c:590
+#: src/dird/ua_output.c:435
 #, c-format
 msgid "Jobid %d used %d Volume(s): %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:454 src/dird/xua_output.c:609
+#: src/dird/ua_output.c:454
 msgid "No Pool specified.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:465 src/dird/ua_select.c:531 src/dird/xua_output.c:620
-#: src/dird/ua_update.c:424
+#: src/dird/ua_output.c:465 src/dird/ua_select.c:531 src/dird/ua_update.c:424
 #, c-format
 msgid "Error obtaining pool ids. ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:475 src/dird/xua_output.c:630
+#: src/dird/ua_output.c:475
 #, c-format
 msgid "Pool: %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:491 src/dird/xua_output.c:646
+#: src/dird/ua_output.c:491
 msgid "Ignoring invalid value for days. Max is 50.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:513 src/dird/xua_output.c:668
+#: src/dird/ua_output.c:513
 #, c-format
 msgid "Unknown list keyword: %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:538 src/dird/xua_output.c:693
+#: src/dird/ua_output.c:538
 #, c-format
 msgid "%s is not a job name.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:552 src/dird/xua_output.c:707
+#: src/dird/ua_output.c:552
 #, c-format
 msgid "Could not find Pool for Job %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:565 src/dird/xua_output.c:720
+#: src/dird/ua_output.c:565
 #, c-format
 msgid "Could not find next Volume for Job %s (Pool=%s, Level=%s).\n"
 msgstr ""
 
-#: src/dird/ua_output.c:569 src/dird/xua_output.c:724
+#: src/dird/ua_output.c:569
 #, c-format
 msgid ""
 "The next Volume to be used by Job \"%s\" (Pool=%s, Level=%s) will be %s\n"
 msgstr ""
 
-#: src/dird/ua_output.c:582 src/dird/xua_output.c:737
+#: src/dird/ua_output.c:582
 #, c-format
 msgid "Could not find next Volume for Job %s.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:727 src/dird/xua_output.c:882
+#: src/dird/ua_output.c:727
 #, c-format
 msgid "Pool %s not in database. %s"
 msgstr ""
 
-#: src/dird/ua_output.c:735 src/dird/xua_output.c:890
+#: src/dird/ua_output.c:735
 #, c-format
 msgid "Pool %s created in database.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:788 src/dird/xua_output.c:943
+#: src/dird/ua_output.c:788
 msgid "You have no messages.\n"
 msgstr ""
 
-#: src/dird/ua_output.c:868 src/dird/xua_output.c:1023
+#: src/dird/ua_output.c:868
 msgid "Message too long to display.\n"
 msgstr ""
 
@@ -12769,19 +12766,6 @@ msgstr ""
 msgid "Director's connection to SD for this Job was lost.\n"
 msgstr ""
 
-#: src/dird/xua_output.c:518
-msgid "Invalid jobid argument\n"
-msgstr ""
-
-#: src/dird/xua_output.c:542
-#, fuzzy, c-format
-msgid "Unknown ObjectType %s\n"
-msgstr "Невідомий тип ресурсу %d\n"
-
-#: src/dird/xua_output.c:552
-msgid "list pluginrestoreconf requires jobid argument\n"
-msgstr ""
-
 #: src/dird/getmsg.c:160
 #, c-format
 msgid "bget_dirmsg: unknown bnet signal %d\n"
@@ -16789,7 +16773,7 @@ msgstr ""
 msgid "DROP-Stmt went wrong\n"
 msgstr ""
 
-#: examples/nagios/check_bacula/check_bacula.c:59
+#: examples/nagios/check_bacula/check_bacula.c:57
 #, c-format
 msgid ""
 "Copyright (C) 2005 Christian Masopust\n"
@@ -16807,18 +16791,18 @@ msgstr ""
 msgid "Failed ASSERT: %s\n"
 msgstr ""
 
-#: src/qt-console/bcomm/dircomm.cpp:79
+#: src/qt-console/bcomm/dircomm.cpp:85
 #, c-format
 msgid "Already connected\"%s\".\n"
 msgstr "Вже приєднано\"%s\".\n"
 
-#: src/qt-console/bcomm/dircomm.cpp:90
+#: src/qt-console/bcomm/dircomm.cpp:96
 #: src/qt-console/tray-monitor/tray-monitor.cpp:347
 #, c-format
 msgid "Connecting to Director %s:%d"
 msgstr "Приєднуюсь до Керівника %s:%d"
 
-#: src/qt-console/bcomm/dircomm.cpp:92
+#: src/qt-console/bcomm/dircomm.cpp:98
 #, c-format
 msgid ""
 "Connecting to Director %s:%d\n"
@@ -16827,40 +16811,40 @@ msgstr ""
 "З'єднуюсь із Керівником %s:%d\n"
 "\n"
 
-#: src/qt-console/bcomm/dircomm.cpp:163
-#: src/qt-console/tray-monitor/tray-monitor.cpp:349
+#: src/qt-console/bcomm/dircomm.cpp:195
+#: src/qt-console/tray-monitor/tray-monitor.cpp:352
 msgid "Director daemon"
 msgstr "Керівник"
 
-#: src/qt-console/bcomm/dircomm.cpp:201
+#: src/qt-console/bcomm/dircomm.cpp:233
 msgid "Initializing ..."
 msgstr "Ініціалізація ..."
 
-#: src/qt-console/bcomm/dircomm.cpp:217 src/qt-console/console/console.cpp:130
+#: src/qt-console/bcomm/dircomm.cpp:249 src/qt-console/console/console.cpp:130
 msgid "Connected"
 msgstr "З'єднано"
 
-#: src/qt-console/bcomm/dircomm.cpp:341
+#: src/qt-console/bcomm/dircomm.cpp:373
 msgid "Command completed ..."
 msgstr "Команду виконано ..."
 
-#: src/qt-console/bcomm/dircomm.cpp:348 src/qt-console/console/console.cpp:367
+#: src/qt-console/bcomm/dircomm.cpp:380 src/qt-console/console/console.cpp:367
 msgid "Processing command ..."
 msgstr "Виконання команди ..."
 
-#: src/qt-console/bcomm/dircomm.cpp:355
+#: src/qt-console/bcomm/dircomm.cpp:387
 msgid "At main prompt waiting for input ..."
 msgstr "Очікуться введення у основній рядку ..."
 
-#: src/qt-console/bcomm/dircomm.cpp:362 src/qt-console/bcomm/dircomm.cpp:375
+#: src/qt-console/bcomm/dircomm.cpp:394 src/qt-console/bcomm/dircomm.cpp:407
 msgid "At prompt waiting for input ..."
 msgstr "Очікуться введення у рядку ..."
 
-#: src/qt-console/bcomm/dircomm.cpp:383
+#: src/qt-console/bcomm/dircomm.cpp:415
 msgid "Command failed."
 msgstr "Помилка команди"
 
-#: src/qt-console/bcomm/dircomm.cpp:455
+#: src/qt-console/bcomm/dircomm.cpp:487
 msgid "Director disconnected."
 msgstr "Керівник від'єднано"
 
@@ -16885,7 +16869,7 @@ msgid "Storage: name=%s address=%s SDport=%d\n"
 msgstr "Сховище: назва=%s address=%s SDport=%d\n"
 
 #: src/qt-console/tray-monitor/tray_conf.cpp:183
-#: src/qt-console/bat_conf.cpp:145
+#: src/qt-console/bat_conf.cpp:146
 #, fuzzy, c-format
 msgid "ConsoleFont: name=%s font face=%s\n"
 msgstr "Консоль: назва=%s rcfile=%s histfile=%s\n"
@@ -16951,52 +16935,52 @@ msgstr ""
 msgid "Error, currentitem is not a Client or a Storage..\n"
 msgstr "Помилка. Поточний пункт не є Клієнтом або Зберігачем.\n"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:354
+#: src/qt-console/tray-monitor/tray-monitor.cpp:357
 #, c-format
 msgid "Connecting to Client %s:%d"
 msgstr "Приєднуюсь до Клієнта %s:%d"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:356
+#: src/qt-console/tray-monitor/tray-monitor.cpp:362
 msgid "File daemon"
 msgstr "Збирач"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:361
+#: src/qt-console/tray-monitor/tray-monitor.cpp:367
 #, c-format
 msgid "Connecting to Storage %s:%d"
 msgstr "Приєднуюсь до Зберігача %s:%d"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:367
-#: src/qt-console/tray-monitor/tray-monitor.cpp:397
+#: src/qt-console/tray-monitor/tray-monitor.cpp:376
+#: src/qt-console/tray-monitor/tray-monitor.cpp:406
 #, c-format
 msgid "Error, currentitem is not a Client, a Storage or a Director..\n"
 msgstr "Помилка. Поточний пункт не є Клієнтом або Зберігачем.\n"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:372
+#: src/qt-console/tray-monitor/tray-monitor.cpp:381
 msgid "Cannot connect to daemon."
 msgstr "Не можу приєднатись до демону."
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:381
+#: src/qt-console/tray-monitor/tray-monitor.cpp:390
 #, c-format
 msgid "Authentication error : %s"
 msgstr "Помилка автентифікації : %s"
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:388
+#: src/qt-console/tray-monitor/tray-monitor.cpp:397
 msgid "Opened connection with Director daemon."
 msgstr "Відкриті з'єднання із Керівником."
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:391
+#: src/qt-console/tray-monitor/tray-monitor.cpp:400
 msgid "Opened connection with File daemon."
 msgstr "Відкриті з'єднання із Збирачем."
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:394
+#: src/qt-console/tray-monitor/tray-monitor.cpp:403
 msgid "Opened connection with Storage daemon."
 msgstr "Відкриті з'єднання із Зберігачем."
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:445
+#: src/qt-console/tray-monitor/tray-monitor.cpp:454
 msgid "Error : BNET_HARDEOF or BNET_ERROR"
 msgstr ""
 
-#: src/qt-console/tray-monitor/tray-monitor.cpp:454
+#: src/qt-console/tray-monitor/tray-monitor.cpp:463
 msgid "Error : Connection closed."
 msgstr "Помилка : З'єднання завершено"
 
@@ -17059,11 +17043,15 @@ msgstr ""
 "       -?          print this message.\n"
 "\n"
 
-#: src/qt-console/bat_conf.cpp:142
+#: src/qt-console/bat_conf.cpp:143
 #, c-format
 msgid "Console: name=%s\n"
 msgstr "Консоль: назва=%s\n"
 
+#, fuzzy
+#~ msgid "Unknown ObjectType %s\n"
+#~ msgstr "Невідомий тип ресурсу %d\n"
+
 #~ msgid "Cannot open current directory: ERR=%s\n"
 #~ msgstr "Не можливо відкрити поточну теку: ERR=%s\n"
 
@@ -17255,10 +17243,6 @@ msgstr "Консоль: назва=%s\n"
 #~ msgstr "Погана відповідь на команду Hello: ERR="
 
 #, fuzzy
-#~ msgid "# Bacula bwx-console Configuration File\n"
-#~ msgstr "Будьласка виправте файл конфігурації: %s\n"
-
-#, fuzzy
 #~ msgid "Unable to write to %s\n"
 #~ msgstr "Не можливо встановити власника файлу %s: ERR=%s\n"
 
@@ -17382,9 +17366,6 @@ msgstr "Консоль: назва=%s\n"
 #~ msgid "Unknown command."
 #~ msgstr "Невідомий статус"
 
-#~ msgid "Welcome to bacula bwx-console %s (%s)!\n"
-#~ msgstr "Ласкаво просимо до bacula bwx-console %s (%s)!\n"
-
 #, fuzzy
 #~ msgid "Connect"
 #~ msgstr "З'єднано"
@@ -17430,10 +17411,6 @@ msgstr "Консоль: назва=%s\n"
 #~ msgstr "Приєднуюсь до Керівника %s:%d"
 
 #, fuzzy
-#~ msgid "About Bacula bwx-console"
-#~ msgstr "Ласкаво просимо до bacula bwx-console %s (%s)!\n"
-
-#, fuzzy
 #~ msgid "Please choose your default configuration file"
 #~ msgstr "Будьласка виправте файл конфігурації: %s\n"
 
diff --git a/bacula/scripts/Makefile.in b/bacula/scripts/Makefile.in
index 5dee735..6d9503c 100755
--- a/bacula/scripts/Makefile.in
+++ b/bacula/scripts/Makefile.in
@@ -107,10 +107,6 @@ distclean: clean
 	@$(RMF) bacula fd btraceback
 	@$(RMF) bacula-ctl-dir bacula-ctl-fd bacula-ctl-sd bacula_config
 	@$(RMF) bconsole logrotate bacula.desktop 
-	@$(RMF) bacula.desktop.gnome1 bacula.desktop.gnome2 mtx-changer dvd-handler
-	@$(RMF) gnome-console.console_apps bacula.desktop.gnome2.xsu
-	@$(RMF) bgnome-console.console_apps
-	@$(RMF) bacula.desktop.gnome2.consolehelper bacula.desktop.gnome1.xsu
-	@$(RMF) bacula.desktop.gnome1.consolehelper
+	@$(RMF) mtx-changer dvd-handler
 
 # ------------------------------------------------------------------------
diff --git a/bacula/scripts/defaultconfig b/bacula/scripts/defaultconfig
index ec218de..c233910 100755
--- a/bacula/scripts/defaultconfig
+++ b/bacula/scripts/defaultconfig
@@ -13,7 +13,6 @@ CFLAGS="-g -Wall" \
     --with-pid-dir=$HOME/bacula/bin \
     --with-subsys-dir=$HOME/bacula/bin \
     --enable-smartalloc \
-    --enable-gnome \
     --with-mysql=$HOME/mysql \
     --with-working-dir=$HOME/bacula/bin/working \
     --with-dump-email=root@localhost \
diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h
index 12b2d0f..5ba3b89 100644
--- a/bacula/src/bacula.h
+++ b/bacula/src/bacula.h
@@ -162,20 +162,6 @@ extern "C" {
 #include "baconfig.h"
 #include "lib/lib.h"
 
-/*
- * For wx-console compiles, we undo some Bacula defines.
- *  This prevents conflicts between wx-Widgets and Bacula.
- *  In wx-console files that malloc or free() Bacula structures
- *  config/resources and interface to the Bacula libraries,
- *  you must use bmalloc() and bfree().
- */
-#ifdef HAVE_WXCONSOLE
-#undef New
-#undef _
-#undef free
-#undef malloc
-#endif
-
 #if defined(HAVE_WIN32)
 #include "win32/winapi.h"
 #include "winhost.h"
diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index 80176a7..b1f1476 100644
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -1011,7 +1011,7 @@ int main(int argc, char *argv[])
    working_directory = "/tmp";
    args = get_pool_memory(PM_FNAME);
 
-   while ((ch = getopt(argc, argv, "D:lbc:d:nstu:?")) != -1) {
+   while ((ch = getopt(argc, argv, "D:lc:d:nstu:?")) != -1) {
       switch (ch) {
       case 'D':                    /* Director */
          if (director) {
diff --git a/bacula/src/qt-console/README b/bacula/src/qt-console/README
index 6f392ff..1db13a3 100644
--- a/bacula/src/qt-console/README
+++ b/bacula/src/qt-console/README
@@ -13,10 +13,9 @@ yourself or if your distro does not have it, we have included the source
 in depkgs-qt, which you can download from the Bacula Source Forge        
 download area.
 
-Building and running bat is done much like bconsole, the gnome console,
-or the wxWidgets console.  You add the appropriate options to your   
-./configure, then simply do a make.  Please see the Installation chapter
-of the manual for more details.
+Building and running bat is done much like bconsole.  You add the appropriate
+ options to your ./configure, then simply do a make.  Please see the
+Installation chapter of the manual for more details.
 
 
 Win32 mingw infos for QT4 :
@@ -104,8 +103,7 @@ Design/implementation considerations:
   a tree view, but for the moment does nothing ...  It is a bit
   ugly. Canceling it should get you back to the normal command prompt.
 
-- Implement a restore page that does a directory tree restore selection
-  much like wx-console does.
+- Implement a restore page that does a directory tree restore selection.
 
 Not working:
 - The left selection window and the right window (where the console
diff --git a/bacula/src/qt-console/tray-monitor/authenticate.cpp b/bacula/src/qt-console/tray-monitor/authenticate.cpp
index 91f4da6..22688b1 100644
--- a/bacula/src/qt-console/tray-monitor/authenticate.cpp
+++ b/bacula/src/qt-console/tray-monitor/authenticate.cpp
@@ -116,7 +116,7 @@ int authenticate_storage_daemon(JCR *jcr, MONITOR *monitor, STORE* store)
    btimer_t *tid = start_bsock_timer(sd, 60 * 5);
    if (!sd->fsend(SDFDhello, dirname)) {
       stop_bsock_timer(tid);
-      Jmsg(jcr, M_FATAL, 0, _("Error sending Hello to Storage daemon. ERR=%s\n"), bnet_strerror(sd));
+      Jmsg(jcr, M_FATAL, 0, _("Error sending Hello to Storage daemon. ERR=%s\n"), sd->bstrerror());
       return 0;
    }
    if (!cram_md5_respond(sd, store->password, &tls_remote_need, &compatible) ||
@@ -162,7 +162,7 @@ int authenticate_file_daemon(JCR *jcr, MONITOR *monitor, CLIENT* client)
    btimer_t *tid = start_bsock_timer(fd, 60 * 5);
    if (!fd->fsend(SDFDhello, dirname)) {
       stop_bsock_timer(tid);
-      Jmsg(jcr, M_FATAL, 0, _("Error sending Hello to File daemon. ERR=%s\n"), bnet_strerror(fd));
+      Jmsg(jcr, M_FATAL, 0, _("Error sending Hello to File daemon. ERR=%s\n"), fd->bstrerror());
       return 0;
    }
    if (!cram_md5_respond(fd, client->password, &tls_remote_need, &compatible) ||
diff --git a/bacula/src/qt-console/tray-monitor/tray-monitor.cpp b/bacula/src/qt-console/tray-monitor/tray-monitor.cpp
index 9a01a8a..ed69d10 100644
--- a/bacula/src/qt-console/tray-monitor/tray-monitor.cpp
+++ b/bacula/src/qt-console/tray-monitor/tray-monitor.cpp
@@ -84,10 +84,10 @@ void dotest()
 void get_list(monitoritem *item, const char *cmd, QStringList &lst)
 {
    int stat;
-
+   
    doconnect(item);
    item->writecmd(cmd);
-   while((stat = bnet_recv(item->D_sock)) >= 0) {
+   while((stat = item->D_sock->recv()) >= 0) {
       strip_trailing_junk(item->D_sock->msg);
       if (*(item->D_sock->msg)) {
          lst << QString(item->D_sock->msg);
@@ -109,7 +109,7 @@ void refresh_item()
          break;
       case R_STORAGE:
          cmd = "status";
-         break;
+         break;          
       default:
          exit(1);
          break;
@@ -124,7 +124,7 @@ void refresh_item()
  *
  */
 int main(int argc, char *argv[])
-{
+{   
    int ch, i, dir_index=-1;
    bool test_config = false;
    DIRRES* dird;
@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
    init_stack_dump();
    my_name_is(argc, argv, "tray-monitor");
    lmgr_init_thread();
-   init_msg(NULL, NULL);
+   init_msg(NULL, NULL, NULL);
    working_directory = "/tmp";
 
    struct sigaction sigignore;
@@ -275,7 +275,7 @@ int main(int argc, char *argv[])
          break;
       case R_STORAGE:
          cmd = "status";
-         break;
+         break;          
       default:
          exit(1);
          break;
@@ -291,15 +291,15 @@ int main(int argc, char *argv[])
       if (items[i].D_sock) {
          items[i].writecmd("quit");
          if (items[i].D_sock) {
-            bnet_sig(items[i].D_sock, BNET_TERMINATE); /* send EOF */
-            bnet_close(items[i].D_sock);
+            items[i].D_sock->signal(BNET_TERMINATE); /* send EOF */
+            free_bsock(items[i].D_sock);
          }
       }
    }
 
 
    (void)WSACleanup();               /* Cleanup Windows sockets */
-
+   
    config->free_resources();
    free(config);
    config = NULL;
@@ -332,9 +332,9 @@ void changeStatusMessage(monitoritem*, const char *fmt,...) {
    tray->statusbar->showMessage(QString(buf));
 }
 
-int doconnect(monitoritem* item)
+int doconnect(monitoritem* item) 
 {
-   if (!item->D_sock) {
+   if (!is_bsock_open(item->D_sock)) {
       memset(&jcr, 0, sizeof(jcr));
 
       DIRRES* dird;
@@ -345,21 +345,30 @@ int doconnect(monitoritem* item)
       case R_DIRECTOR:
          dird = (DIRRES*)item->resource;
          changeStatusMessage(item, _("Connecting to Director %s:%d"), dird->address, dird->DIRport);
-         item->D_sock = bnet_connect(NULL, monitor->DIRConnectTimeout,
+         if (!item->D_sock) {
+            item->D_sock = new_bsock();
+         }
+         item->D_sock->connect(NULL, monitor->DIRConnectTimeout, 
                                      0, 0, _("Director daemon"), dird->address, NULL, dird->DIRport, 0);
          jcr.dir_bsock = item->D_sock;
          break;
       case R_CLIENT:
          filed = (CLIENT*)item->resource;
          changeStatusMessage(item, _("Connecting to Client %s:%d"), filed->address, filed->FDport);
-         item->D_sock = bnet_connect(NULL, monitor->FDConnectTimeout,
+         if (!item->D_sock) {
+            item->D_sock = new_bsock();
+         }
+         item->D_sock->connect(NULL, monitor->FDConnectTimeout, 
                                      0, 0, _("File daemon"), filed->address, NULL, filed->FDport, 0);
          jcr.file_bsock = item->D_sock;
          break;
       case R_STORAGE:
          stored = (STORE*)item->resource;
          changeStatusMessage(item, _("Connecting to Storage %s:%d"), stored->address, stored->SDport);
-         item->D_sock = bnet_connect(NULL, monitor->SDConnectTimeout,
+         if (!item->D_sock) {
+            item->D_sock = new_bsock();
+         }
+         item->D_sock->connect(NULL, monitor->SDConnectTimeout, 
                                      0, 0, _("Storage daemon"), stored->address, NULL, stored->SDport, 0);
          jcr.store_bsock = item->D_sock;
          break;
@@ -406,7 +415,7 @@ int doconnect(monitoritem* item)
    return 1;
 }
 
-int docmd(monitoritem* item, const char* command)
+int docmd(monitoritem* item, const char* command) 
 {
    int stat;
    //qDebug() << "docmd(" << item->get_name() << "," << command << ")";
@@ -418,7 +427,7 @@ int docmd(monitoritem* item, const char* command)
       item->writecmd(command);
 
    while(1) {
-      if ((stat = bnet_recv(item->D_sock)) >= 0) {
+      if ((stat = item->D_sock->recv()) >= 0) {
          strip_trailing_newline(item->D_sock->msg);
          tray->appendText(item->get_name(), item->D_sock->msg);
       }
@@ -432,7 +441,7 @@ int docmd(monitoritem* item, const char* command)
             return 0;
          }
          else if (item->D_sock->msglen == BNET_HEARTBEAT) {
-            bnet_sig(item->D_sock, BNET_HB_RESPONSE);
+            item->D_sock->signal(BNET_HB_RESPONSE);
          }
          else {
             qDebug() << bnet_sig_to_ascii(item->D_sock);
@@ -447,7 +456,7 @@ int docmd(monitoritem* item, const char* command)
          return 0;
       }
 
-      if (is_bnet_stop(item->D_sock)) {
+      if (item->D_sock->is_stop()) {
          item->D_sock = NULL;
          item->state = error;
          item->oldstate = error;
diff --git a/bacula/src/qt-console/tray-monitor/tray-monitor.h b/bacula/src/qt-console/tray-monitor/tray-monitor.h
index 9d06ce6..33f111b 100644
--- a/bacula/src/qt-console/tray-monitor/tray-monitor.h
+++ b/bacula/src/qt-console/tray-monitor/tray-monitor.h
@@ -87,7 +87,7 @@ public:
    void writecmd(const char* command) {
       if (this->D_sock) {
          this->D_sock->msglen = pm_strcpy(&this->D_sock->msg, command);
-         bnet_send(this->D_sock);
+         this->D_sock->send();
       }
    }
 
diff --git a/bacula/src/qt-console/tray-monitor/tray-ui.h b/bacula/src/qt-console/tray-monitor/tray-ui.h
index 0c2b959..d008405 100644
--- a/bacula/src/qt-console/tray-monitor/tray-ui.h
+++ b/bacula/src/qt-console/tray-monitor/tray-ui.h
@@ -142,7 +142,7 @@ private slots:
       qDebug() << cmd;
       item->D_sock->fsend("%s", cmd.toUtf8().data());
       QString output;
-      while(bnet_recv(item->D_sock) >= 0) {output += item->D_sock->msg;}
+      while(item->D_sock->recv() >= 0) {output += item->D_sock->msg;}
       QMessageBox msgBox;
       msgBox.setText(output);
       msgBox.exec();
diff --git a/bacula/src/tools/Makefile.in b/bacula/src/tools/Makefile.in
index 89879a6..136c101 100644
--- a/bacula/src/tools/Makefile.in
+++ b/bacula/src/tools/Makefile.in
@@ -39,7 +39,7 @@ DIRTOOLS = bsmtp dbcheck drivetype fstype testfind testls bregex bwild bbatch br
 TOOLS = $(@DIR_TOOLS@)
 
 INSNODIRTOOLS = bsmtp
-INSDIRTOOLS = bsmtp dbcheck bwild bregex
+INSDIRTOOLS = bsmtp dbcheck bwild bregex bpluginfo
 INSTOOLS = $(INS@DIR_TOOLS@)
 
 .SUFFIXES:	.c .o