From: <ke...@us...> - 2007-08-30 16:19:49
|
Revision: 5417 http://bacula.svn.sourceforge.net/bacula/?rev=5417&view=rev Author: kerns Date: 2007-08-30 09:19:42 -0700 (Thu, 30 Aug 2007) Log Message: ----------- kes Update POTFILES.in kes Cleanup a few underquoted AC_DEFUNs in configure Modified Paths: -------------- trunk/bacula/ChangeLog trunk/bacula/autoconf/bacula-macros/db.m4 trunk/bacula/autoconf/bacula-macros/largefiles.m4 trunk/bacula/autoconf/bacula-macros/os.m4 trunk/bacula/autoconf/configure.in trunk/bacula/configure trunk/bacula/po/LINGUAS trunk/bacula/po/POTFILES.in trunk/bacula/po/README trunk/bacula/po/bacula.pot trunk/bacula/po/de.po trunk/bacula/po/fr.po trunk/bacula/technotes-2.3 Added Paths: ----------- trunk/bacula/technotes-2.1 Modified: trunk/bacula/ChangeLog =================================================================== --- trunk/bacula/ChangeLog 2007-08-30 14:22:48 UTC (rev 5416) +++ trunk/bacula/ChangeLog 2007-08-30 16:19:42 UTC (rev 5417) @@ -3,6 +3,8 @@ General: Release Version 2.2.1 30Aug07 +kes Update POTFILES.in +kes Cleanup a few underquoted AC_DEFUNs in configure kes Apply patch from Martin Simmons that adds a test for va_copy to ./configure 29Aug07 Modified: trunk/bacula/autoconf/bacula-macros/db.m4 =================================================================== --- trunk/bacula/autoconf/bacula-macros/db.m4 2007-08-30 14:22:48 UTC (rev 5416) +++ trunk/bacula/autoconf/bacula-macros/db.m4 2007-08-30 16:19:42 UTC (rev 5417) @@ -1,4 +1,4 @@ -AC_DEFUN(BA_CHECK_MYSQL_DB, +AC_DEFUN([BA_CHECK_MYSQL_DB], [ db_found=no AC_MSG_CHECKING(for MySQL support) @@ -213,7 +213,7 @@ ]) -AC_DEFUN(BA_CHECK_SQLITE_DB, +AC_DEFUN([BA_CHECK_SQLITE_DB], [ db_found=no AC_MSG_CHECKING(for SQLite support) @@ -295,7 +295,7 @@ ]) -AC_DEFUN(BA_CHECK_SQLITE3_DB, +AC_DEFUN([BA_CHECK_SQLITE3_DB], [ db_found=no AC_MSG_CHECKING(for SQLite3 support) @@ -379,7 +379,7 @@ -AC_DEFUN(BA_CHECK_POSTGRESQL_DB, +AC_DEFUN([BA_CHECK_POSTGRESQL_DB], [ db_found=no AC_MSG_CHECKING(for PostgreSQL support) @@ -477,7 +477,7 @@ -AC_DEFUN(BA_CHECK_SQL_DB, +AC_DEFUN([BA_CHECK_SQL_DB], [AC_MSG_CHECKING(Checking for various databases) dnl# -------------------------------------------------------------------------- dnl# CHECKING FOR VARIOUS DATABASES (thanks to UdmSearch team) @@ -1010,7 +1010,7 @@ ]) -AC_DEFUN(AM_CONDITIONAL, +AC_DEFUN([AM_CONDITIONAL], [AC_SUBST($1_TRUE) AC_SUBST($1_FALSE) if $2; then Modified: trunk/bacula/autoconf/bacula-macros/largefiles.m4 =================================================================== --- trunk/bacula/autoconf/bacula-macros/largefiles.m4 2007-08-30 14:22:48 UTC (rev 5416) +++ trunk/bacula/autoconf/bacula-macros/largefiles.m4 2007-08-30 16:19:42 UTC (rev 5417) @@ -14,7 +14,7 @@ dnl Internal subroutine of AC_SYS_LARGEFILE. dnl AC_SYS_LARGEFILE_FLAGS(FLAGSNAME) -AC_DEFUN(AC_SYS_LARGEFILE_FLAGS, +AC_DEFUN([AC_SYS_LARGEFILE_FLAGS], [AC_CACHE_CHECK([for $1 value to request large file support], ac_cv_sys_largefile_$1, [ac_cv_sys_largefile_$1=`($GETCONF LFS_$1) 2>/dev/null` || { @@ -37,7 +37,7 @@ dnl Internal subroutine of AC_SYS_LARGEFILE. dnl AC_SYS_LARGEFILE_SPACE_APPEND(VAR, VAL) -AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND, +AC_DEFUN([AC_SYS_LARGEFILE_SPACE_APPEND], [case $2 in no) ;; ?*) @@ -49,7 +49,7 @@ dnl Internal subroutine of AC_SYS_LARGEFILE. dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT) -AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE, +AC_DEFUN([AC_SYS_LARGEFILE_MACRO_VALUE], [AC_CACHE_CHECK([for $1], $2, [$2=no changequote(, )dnl @@ -68,7 +68,7 @@ AC_DEFINE_UNQUOTED([$1], [$]$2, [$3]) fi]) -AC_DEFUN(AC_BAC_LARGEFILE, +AC_DEFUN([AC_BAC_LARGEFILE], [AC_REQUIRE([AC_CANONICAL_HOST]) AC_ARG_ENABLE(largefile, [ --disable-largefile omit support for large files]) Modified: trunk/bacula/autoconf/bacula-macros/os.m4 =================================================================== --- trunk/bacula/autoconf/bacula-macros/os.m4 2007-08-30 14:22:48 UTC (rev 5416) +++ trunk/bacula/autoconf/bacula-macros/os.m4 2007-08-30 16:19:42 UTC (rev 5417) @@ -1,6 +1,6 @@ dnl Check type of signal routines (posix, 4.2bsd, 4.1bsd or v7) -AC_DEFUN(SIGNAL_CHECK, +AC_DEFUN([SIGNAL_CHECK], [AC_REQUIRE([AC_TYPE_SIGNAL]) AC_MSG_CHECKING(for type of signal functions) AC_CACHE_VAL(bash_cv_signal_vintage, @@ -14,18 +14,18 @@ ], bash_cv_signal_vintage="posix", [ AC_TRY_LINK([#include <signal.h>], [ - int mask = sigmask(SIGINT); - sigsetmask(mask); sigblock(mask); sigpause(mask); + int mask = sigmask(SIGINT); + sigsetmask(mask); sigblock(mask); sigpause(mask); ], bash_cv_signal_vintage="4.2bsd", [ - AC_TRY_LINK([ - #include <signal.h> - RETSIGTYPE foo() { }], [ - int mask = sigmask(SIGINT); - sigset(SIGINT, foo); sigrelse(SIGINT); - sighold(SIGINT); sigpause(SIGINT); + AC_TRY_LINK([ + #include <signal.h> + RETSIGTYPE foo() { }], [ + int mask = sigmask(SIGINT); + sigset(SIGINT, foo); sigrelse(SIGINT); + sighold(SIGINT); sigpause(SIGINT); ], bash_cv_signal_vintage="svr3", bash_cv_signal_vintage="v7" - )] + )] )] ) ]) @@ -39,7 +39,7 @@ fi ]) -AC_DEFUN(BA_CONDITIONAL, +AC_DEFUN([BA_CONDITIONAL], [AC_SUBST($1_TRUE) AC_SUBST($1_FALSE) if $2; then @@ -51,95 +51,95 @@ fi]) -AC_DEFUN(BA_CHECK_OPSYS, +AC_DEFUN([BA_CHECK_OPSYS], [ AC_CYGWIN if test $HAVE_UNAME=yes -a x`uname -s` = xSunOS then - BA_CONDITIONAL(HAVE_SUN_OS, $TRUEPRG) - AC_DEFINE(HAVE_SUN_OS) + BA_CONDITIONAL(HAVE_SUN_OS, $TRUEPRG) + AC_DEFINE(HAVE_SUN_OS) else - BA_CONDITIONAL(HAVE_SUN_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_SUN_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xOSF1 then - BA_CONDITIONAL(HAVE_OSF1_OS, $TRUEPRG) - AC_DEFINE(HAVE_OSF1_OS) + BA_CONDITIONAL(HAVE_OSF1_OS, $TRUEPRG) + AC_DEFINE(HAVE_OSF1_OS) else - BA_CONDITIONAL(HAVE_OSF1_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_OSF1_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xAIX then - BA_CONDITIONAL(HAVE_AIX_OS, $TRUEPRG) - AC_DEFINE(HAVE_AIX_OS) + BA_CONDITIONAL(HAVE_AIX_OS, $TRUEPRG) + AC_DEFINE(HAVE_AIX_OS) else - BA_CONDITIONAL(HAVE_AIX_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_AIX_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xHP-UX then - BA_CONDITIONAL(HAVE_HPUX_OS, $TRUEPRG) - AC_DEFINE(HAVE_HPUX_OS) + BA_CONDITIONAL(HAVE_HPUX_OS, $TRUEPRG) + AC_DEFINE(HAVE_HPUX_OS) else - BA_CONDITIONAL(HAVE_HPUX_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_HPUX_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xLinux then - BA_CONDITIONAL(HAVE_LINUX_OS, $TRUEPRG) - AC_DEFINE(HAVE_LINUX_OS) + BA_CONDITIONAL(HAVE_LINUX_OS, $TRUEPRG) + AC_DEFINE(HAVE_LINUX_OS) else - BA_CONDITIONAL(HAVE_LINUX_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_LINUX_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD then - BA_CONDITIONAL(HAVE_FREEBSD_OS, $TRUEPRG) - AC_DEFINE(HAVE_FREEBSD_OS) + BA_CONDITIONAL(HAVE_FREEBSD_OS, $TRUEPRG) + AC_DEFINE(HAVE_FREEBSD_OS) else - BA_CONDITIONAL(HAVE_FREEBSD_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_FREEBSD_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD then - BA_CONDITIONAL(HAVE_NETBSD_OS, $TRUEPRG) - AC_DEFINE(HAVE_NETBSD_OS) + BA_CONDITIONAL(HAVE_NETBSD_OS, $TRUEPRG) + AC_DEFINE(HAVE_NETBSD_OS) else - BA_CONDITIONAL(HAVE_NETBSD_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_NETBSD_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD then - BA_CONDITIONAL(HAVE_OPENBSD_OS, $TRUEPRG) - AC_DEFINE(HAVE_OPENBSD_OS) + BA_CONDITIONAL(HAVE_OPENBSD_OS, $TRUEPRG) + AC_DEFINE(HAVE_OPENBSD_OS) else - BA_CONDITIONAL(HAVE_OPENBSD_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_OPENBSD_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xBSD/OS then - BA_CONDITIONAL(HAVE_BSDI_OS, $TRUEPRG) - AC_DEFINE(HAVE_BSDI_OS) + BA_CONDITIONAL(HAVE_BSDI_OS, $TRUEPRG) + AC_DEFINE(HAVE_BSDI_OS) else - BA_CONDITIONAL(HAVE_BSDI_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_BSDI_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xSGI then - BA_CONDITIONAL(HAVE_SGI_OS, $TRUEPRG) - AC_DEFINE(HAVE_SGI_OS) + BA_CONDITIONAL(HAVE_SGI_OS, $TRUEPRG) + AC_DEFINE(HAVE_SGI_OS) else - BA_CONDITIONAL(HAVE_SGI_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_SGI_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xIRIX -o x`uname -s` = xIRIX64 then - BA_CONDITIONAL(HAVE_IRIX_OS, $TRUEPRG) - AC_DEFINE(HAVE_IRIX_OS) + BA_CONDITIONAL(HAVE_IRIX_OS, $TRUEPRG) + AC_DEFINE(HAVE_IRIX_OS) else - BA_CONDITIONAL(HAVE_IRIX_OS, $FALSEPRG) + BA_CONDITIONAL(HAVE_IRIX_OS, $FALSEPRG) fi if test $HAVE_UNAME=yes -a x`uname -s` = xDarwin @@ -151,74 +151,74 @@ fi ]) -AC_DEFUN(BA_CHECK_OPSYS_DISTNAME, +AC_DEFUN([BA_CHECK_OPSYS_DISTNAME], [AC_MSG_CHECKING(for Operating System Distribution) if test "x$DISTNAME" != "x" then echo "distname set to $DISTNAME" elif test $HAVE_UNAME=yes -a x`uname -s` = xOSF1 then - DISTNAME=alpha + DISTNAME=alpha elif test $HAVE_UNAME=yes -a x`uname -s` = xAIX then - DISTNAME=aix + DISTNAME=aix elif test $HAVE_UNAME=yes -a x`uname -s` = xHP-UX then - DISTNAME=hpux + DISTNAME=hpux elif test $HAVE_UNAME=yes -a x`uname -s` = xSunOS then - DISTNAME=solaris + DISTNAME=solaris elif test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD then - DISTNAME=freebsd + DISTNAME=freebsd elif test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD then - DISTNAME=netbsd + DISTNAME=netbsd elif test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD then - DISTNAME=openbsd + DISTNAME=openbsd elif test $HAVE_UNAME=yes -a x`uname -s` = xIRIX then - DISTNAME=irix + DISTNAME=irix elif test $HAVE_UNAME=yes -a x`uname -s` = xBSD/OS then - DISTNAME=bsdi + DISTNAME=bsdi elif test -f /etc/SuSE-release then - DISTNAME=suse + DISTNAME=suse elif test -d /etc/SuSEconfig then - DISTNAME=suse5 + DISTNAME=suse5 elif test -f /etc/mandrake-release then - DISTNAME=mandrake + DISTNAME=mandrake elif test -f /etc/whitebox-release then DISTNAME=redhat elif test -f /etc/redhat-release then - DISTNAME=redhat + DISTNAME=redhat elif test -f /etc/gentoo-release then - DISTNAME=gentoo + DISTNAME=gentoo elif test -f /etc/debian_version then - DISTNAME=debian + DISTNAME=debian elif test -f /etc/slackware-version then - DISTNAME=slackware + DISTNAME=slackware elif test $HAVE_UNAME=yes -a x`uname -s` = xDarwin then DISTNAME=darwin elif test -f /etc/engarde-version then - DISTNAME=engarde + DISTNAME=engarde elif test "$CYGWIN" = yes then - DISTNAME=cygwin - AC_DEFINE(HAVE_CYGWIN) + DISTNAME=cygwin + AC_DEFINE(HAVE_CYGWIN) else - DISTNAME=unknown + DISTNAME=unknown fi AC_MSG_RESULT(done) ]) Modified: trunk/bacula/autoconf/configure.in =================================================================== --- trunk/bacula/autoconf/configure.in 2007-08-30 14:22:48 UTC (rev 5416) +++ trunk/bacula/autoconf/configure.in 2007-08-30 16:19:42 UTC (rev 5417) @@ -20,7 +20,6 @@ AC_PATH_PROGS(TRUEPRG, true, :) AC_PATH_PROGS(FALSEPRG, false, :) -#AC_CANONICAL_HOST dnl bacula version VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` @@ -98,6 +97,7 @@ THE_AWK=$AWK AC_PATH_PROG(AWK, $THE_AWK, $THE_AWK) + test -n "$ARFLAG" || ARFLAGS="cr" AC_SUBST(ARFLAGS) @@ -171,12 +171,6 @@ fi -# ------------------------------------------------------------------ -# All list of languages for which a translation exist. Each -# language is separated by a space. -# ------------------------------------------------------------------ -ALL_LINGUAS="" - AC_PATH_PROGS(MSGFMT, msgfmt, no) if test "$MSGFMT" = "no" then Modified: trunk/bacula/configure =================================================================== --- trunk/bacula/configure 2007-08-30 14:22:48 UTC (rev 5416) +++ trunk/bacula/configure 2007-08-30 16:19:42 UTC (rev 5417) @@ -1529,7 +1529,6 @@ test -n "$FALSEPRG" || FALSEPRG=":" -#AC_CANONICAL_HOST VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` DATE=`sed -n -e 's/^.* \t*BDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` @@ -4330,6 +4329,7 @@ fi + test -n "$ARFLAG" || ARFLAGS="cr" @@ -4412,7 +4412,7 @@ HAVE_SUN_OS_TRUE='#' HAVE_SUN_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_SUN_OS 1 _ACEOF @@ -4439,7 +4439,7 @@ HAVE_OSF1_OS_TRUE='#' HAVE_OSF1_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_OSF1_OS 1 _ACEOF @@ -4466,7 +4466,7 @@ HAVE_AIX_OS_TRUE='#' HAVE_AIX_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_AIX_OS 1 _ACEOF @@ -4493,7 +4493,7 @@ HAVE_HPUX_OS_TRUE='#' HAVE_HPUX_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_HPUX_OS 1 _ACEOF @@ -4520,7 +4520,7 @@ HAVE_LINUX_OS_TRUE='#' HAVE_LINUX_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_LINUX_OS 1 _ACEOF @@ -4547,7 +4547,7 @@ HAVE_FREEBSD_OS_TRUE='#' HAVE_FREEBSD_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_FREEBSD_OS 1 _ACEOF @@ -4574,7 +4574,7 @@ HAVE_NETBSD_OS_TRUE='#' HAVE_NETBSD_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_NETBSD_OS 1 _ACEOF @@ -4601,7 +4601,7 @@ HAVE_OPENBSD_OS_TRUE='#' HAVE_OPENBSD_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_OPENBSD_OS 1 _ACEOF @@ -4628,7 +4628,7 @@ HAVE_BSDI_OS_TRUE='#' HAVE_BSDI_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_BSDI_OS 1 _ACEOF @@ -4655,7 +4655,7 @@ HAVE_SGI_OS_TRUE='#' HAVE_SGI_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_SGI_OS 1 _ACEOF @@ -4682,7 +4682,7 @@ HAVE_IRIX_OS_TRUE='#' HAVE_IRIX_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_IRIX_OS 1 _ACEOF @@ -4735,70 +4735,70 @@ echo "distname set to $DISTNAME" elif test $HAVE_UNAME=yes -a x`uname -s` = xOSF1 then - DISTNAME=alpha + DISTNAME=alpha elif test $HAVE_UNAME=yes -a x`uname -s` = xAIX then - DISTNAME=aix + DISTNAME=aix elif test $HAVE_UNAME=yes -a x`uname -s` = xHP-UX then - DISTNAME=hpux + DISTNAME=hpux elif test $HAVE_UNAME=yes -a x`uname -s` = xSunOS then - DISTNAME=solaris + DISTNAME=solaris elif test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD then - DISTNAME=freebsd + DISTNAME=freebsd elif test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD then - DISTNAME=netbsd + DISTNAME=netbsd elif test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD then - DISTNAME=openbsd + DISTNAME=openbsd elif test $HAVE_UNAME=yes -a x`uname -s` = xIRIX then - DISTNAME=irix + DISTNAME=irix elif test $HAVE_UNAME=yes -a x`uname -s` = xBSD/OS then - DISTNAME=bsdi + DISTNAME=bsdi elif test -f /etc/SuSE-release then - DISTNAME=suse + DISTNAME=suse elif test -d /etc/SuSEconfig then - DISTNAME=suse5 + DISTNAME=suse5 elif test -f /etc/mandrake-release then - DISTNAME=mandrake + DISTNAME=mandrake elif test -f /etc/whitebox-release then DISTNAME=redhat elif test -f /etc/redhat-release then - DISTNAME=redhat + DISTNAME=redhat elif test -f /etc/gentoo-release then - DISTNAME=gentoo + DISTNAME=gentoo elif test -f /etc/debian_version then - DISTNAME=debian + DISTNAME=debian elif test -f /etc/slackware-version then - DISTNAME=slackware + DISTNAME=slackware elif test $HAVE_UNAME=yes -a x`uname -s` = xDarwin then DISTNAME=darwin elif test -f /etc/engarde-version then - DISTNAME=engarde + DISTNAME=engarde elif test "$CYGWIN" = yes then - DISTNAME=cygwin - cat >>confdefs.h <<\_ACEOF + DISTNAME=cygwin + cat >>confdefs.h <<\_ACEOF #define HAVE_CYGWIN 1 _ACEOF else - DISTNAME=unknown + DISTNAME=unknown fi echo "$as_me:$LINENO: result: done" >&5 echo "${ECHO_T}done" >&6 @@ -6771,12 +6771,6 @@ fi -# ------------------------------------------------------------------ -# All list of languages for which a translation exist. Each -# language is separated by a space. -# ------------------------------------------------------------------ -ALL_LINGUAS="" - for ac_prog in msgfmt do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -21810,8 +21804,8 @@ main () { - int mask = sigmask(SIGINT); - sigsetmask(mask); sigblock(mask); sigpause(mask); + int mask = sigmask(SIGINT); + sigsetmask(mask); sigblock(mask); sigpause(mask); ; return 0; @@ -21845,22 +21839,22 @@ sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include <signal.h> - RETSIGTYPE foo() { } + #include <signal.h> + RETSIGTYPE foo() { } int main () { - int mask = sigmask(SIGINT); - sigset(SIGINT, foo); sigrelse(SIGINT); - sighold(SIGINT); sigpause(SIGINT); + int mask = sigmask(SIGINT); + sigset(SIGINT, foo); sigrelse(SIGINT); + sighold(SIGINT); sigpause(SIGINT); ; return 0; Modified: trunk/bacula/po/LINGUAS =================================================================== --- trunk/bacula/po/LINGUAS 2007-08-30 14:22:48 UTC (rev 5416) +++ trunk/bacula/po/LINGUAS 2007-08-30 16:19:42 UTC (rev 5417) @@ -1,6 +1,2 @@ fr -it de -es -fi -sv Modified: trunk/bacula/po/POTFILES.in =================================================================== --- trunk/bacula/po/POTFILES.in 2007-08-30 14:22:48 UTC (rev 5416) +++ trunk/bacula/po/POTFILES.in 2007-08-30 16:19:42 UTC (rev 5417) @@ -1,377 +1,443 @@ # List of source files containing translatable strings. # To generate this file, type 'make gen-potfiles' -./platforms/freebsd/tapetest.c -./src/cats/bdb.c -./src/cats/bdb_create.c -./src/cats/bdb_delete.c -./src/cats/bdb_find.c -./src/cats/bdb_get.c -./src/cats/bdb_list.c -./src/cats/bdb_update.c -./src/cats/mysql.c -./src/cats/postgresql.c -./src/cats/sql.c -./src/cats/sql_cmds.c -./src/cats/sql_create.c -./src/cats/sql_delete.c -./src/cats/sql_find.c -./src/cats/sql_get.c -./src/cats/sql_list.c -./src/cats/sql_update.c -./src/cats/sqlite.c -./src/dird/admin.c -./src/dird/authenticate.c -./src/dird/autoprune.c +./patches/testing/resubst.c +./patches/testing/bregsed.c +./src/dird/next_vol.c +./src/dird/fd_cmds.c +./src/dird/ua_label.c ./src/dird/backup.c -./src/dird/bsr.c +./src/dird/ua_update.c +./src/dird/run_conf.c +./src/dird/scheduler.c ./src/dird/catreq.c -./src/dird/dird.c -./src/dird/dird_conf.c -./src/dird/expand.c -./src/dird/fd_cmds.c -./src/dird/getmsg.c -./src/dird/inc_conf.c -./src/dird/job.c -./src/dird/jobq.c -./src/dird/migrate.c -./src/dird/mountreq.c ./src/dird/msgchan.c -./src/dird/newvol.c -./src/dird/next_vol.c -./src/dird/pythondir.c -./src/dird/recycle.c -./src/dird/restore.c -./src/dird/run_conf.c -./src/dird/scheduler.c ./src/dird/ua_acl.c -./src/dird/ua_cmds.c -./src/dird/ua_dotcmds.c ./src/dird/ua_input.c -./src/dird/ua_label.c ./src/dird/ua_output.c -./src/dird/ua_prune.c +./src/dird/getmsg.c +./src/dird/migrate.c +./src/dird/ua_query.c +./src/dird/ua_select.c +./src/dird/verify.c ./src/dird/ua_purge.c -./src/dird/ua_query.c ./src/dird/ua_restore.c +./src/dird/ua_status.c +./src/dird/newvol.c +./src/dird/mountreq.c +./src/dird/job.c +./src/dird/ua_cmds.c +./src/dird/inc_conf.c +./src/dird/authenticate.c +./src/dird/ua_prune.c +./src/dird/expand.c +./src/dird/pythondir.c +./src/dird/autoprune.c +./src/dird/dird.c +./src/dird/ua_dotcmds.c +./src/dird/restore.c +./src/dird/ua_tree.c +./src/dird/recycle.c +./src/dird/bsr.c +./src/dird/dird_conf.c +./src/dird/admin.c ./src/dird/ua_run.c -./src/dird/ua_select.c +./src/dird/jobq.c ./src/dird/ua_server.c -./src/dird/ua_status.c -./src/dird/ua_tree.c -./src/dird/ua_update.c -./src/dird/verify.c -./src/console/authenticate.c -./src/console/conio.c -./src/console/console.c -./src/console/console_conf.c +./src/filed/heartbeat.c ./src/filed/acl.c -./src/filed/authenticate.c +./src/filed/verify.c ./src/filed/backup.c +./src/filed/job.c ./src/filed/estimate.c +./src/filed/authenticate.c +./src/filed/restore.c ./src/filed/filed.c +./src/filed/status.c +./src/filed/verify_vol.c ./src/filed/filed_conf.c -./src/filed/heartbeat.c -./src/filed/job.c ./src/filed/pythonfd.c -./src/filed/restore.c -./src/filed/status.c -./src/filed/verify.c -./src/filed/verify_vol.c -./src/findlib/attribs.c -./src/findlib/bfile.c -./src/findlib/create_file.c -./src/findlib/drivetype.c -./src/findlib/enable_priv.c -./src/findlib/find.c -./src/findlib/find_one.c -./src/findlib/fstype.c -./src/findlib/makepath.c -./src/findlib/match.c -./src/findlib/save-cwd.c +./src/gnome2-console/interface.c +./src/gnome2-console/console.c +./src/gnome2-console/console_conf.c +./src/gnome2-console/support.c ./src/gnome2-console/authenticate.c ./src/gnome2-console/callbacks.c -./src/gnome2-console/console.c -./src/gnome2-console/console_conf.c -./src/gnome2-console/interface.c ./src/gnome2-console/restore.c -./src/gnome2-console/support.c -./src/lib/address_conf.c -./src/lib/alist.c -./src/lib/attr.c -./src/lib/base64.c -./src/lib/berrno.c -./src/lib/bget_msg.c -./src/lib/bnet.c -./src/lib/bnet_server.c -./src/lib/bpipe.c -./src/lib/bregex.c -./src/lib/bsnprintf.c -./src/lib/bsys.c -./src/lib/btime.c -./src/lib/btimers.c -./src/lib/cram-md5.c -./src/lib/crc32.c -./src/lib/crypto.c -./src/lib/daemon.c -./src/lib/dlist.c -./src/lib/edit.c -./src/lib/enh_fnmatch.c -./src/lib/fnmatch.c -./src/lib/hmac.c -./src/lib/htable.c -./src/lib/idcache.c -./src/lib/jcr.c -./src/lib/lex.c -./src/lib/md5.c -./src/lib/mem_pool.c -./src/lib/message.c -./src/lib/openssl.c -./src/lib/parse_conf.c -./src/lib/pythonlib.c -./src/lib/queue.c -./src/lib/rblist.c -./src/lib/res.c -./src/lib/runscript.c -./src/lib/rwlock.c -./src/lib/scan.c -./src/lib/serial.c -./src/lib/sha1.c -./src/lib/signal.c -./src/lib/smartall.c -./src/lib/tls.c -./src/lib/tree.c -./src/lib/util.c -./src/lib/var.c -./src/lib/watchdog.c -./src/lib/workq.c -./src/stored/acquire.c -./src/stored/ansi_label.c -./src/stored/append.c -./src/stored/askdir.c -./src/stored/authenticate.c +./src/cats/sql.c +./src/cats/sql_update.c +./src/cats/sqlite.c +./src/cats/bdb_find.c +./src/cats/sql_find.c +./src/cats/mysql.c +./src/cats/bdb_delete.c +./src/cats/bdb_create.c +./src/cats/sql_delete.c +./src/cats/sql_create.c +./src/cats/bdb_get.c +./src/cats/sql_get.c +./src/cats/postgresql.c +./src/cats/sql_cmds.c +./src/cats/bdb_list.c +./src/cats/bdb.c +./src/cats/bdb_update.c +./src/cats/sql_list.c +./src/wx-console/console_conf.c +./src/wx-console/authenticate.c +./src/stored/fd_cmds.c ./src/stored/autochanger.c +./src/stored/stored.c +./src/stored/match_bsr.c +./src/stored/wait.c +./src/stored/stored_conf.c +./src/stored/pythonsd.c +./src/stored/ebcdic.c +./src/stored/read_record.c +./src/stored/read.c +./src/stored/reserve.c ./src/stored/bcopy.c ./src/stored/bextract.c -./src/stored/block.c +./src/stored/dvd.c +./src/stored/label.c +./src/stored/parse_bsr.c ./src/stored/bls.c +./src/stored/status.c ./src/stored/bscan.c +./src/stored/lock.c ./src/stored/btape.c -./src/stored/butil.c -./src/stored/dev.c +./src/stored/spool.c ./src/stored/device.c +./src/stored/mac.c +./src/stored/mount.c ./src/stored/dircmd.c -./src/stored/dvd.c -./src/stored/ebcdic.c -./src/stored/fd_cmds.c +./src/stored/append.c ./src/stored/job.c -./src/stored/label.c -./src/stored/mac.c -./src/stored/match_bsr.c -./src/stored/mount.c -./src/stored/parse_bsr.c -./src/stored/pythonsd.c -./src/stored/read.c -./src/stored/read_record.c +./src/stored/askdir.c +./src/stored/dev.c +./src/stored/authenticate.c ./src/stored/record.c -./src/stored/reserve.c +./src/stored/butil.c ./src/stored/scan.c -./src/stored/spool.c -./src/stored/status.c -./src/stored/stored.c -./src/stored/stored_conf.c -./src/stored/wait.c -./src/tools/bregex.c -./src/tools/bsmtp.c +./src/stored/acquire.c +./src/stored/ansi_label.c +./src/stored/block.c +./src/tools/grow.c +./src/tools/testls.c +./src/tools/bregtest.c +./src/tools/testfind.c ./src/tools/bwild.c +./src/tools/bbatch.c ./src/tools/dbcheck.c +./src/tools/gigaslam.c +./src/tools/bsmtp.c +./src/tools/fstype.c ./src/tools/drivetype.c -./src/tools/fstype.c -./src/tools/testfind.c -./src/tools/testls.c +./src/tools/bregex.c +./src/console/authenticate.c +./src/console/console.c +./src/console/conio.c +./src/console/console_conf.c +./src/win32/scripts/bsleep.c +./src/win32/compat/getopt.c +./src/win32/compat/winapi.c ./src/tray-monitor/authenticate.c -./src/tray-monitor/eggmarshalers.c -./src/tray-monitor/eggstatusicon.c -./src/tray-monitor/eggtrayicon.c ./src/tray-monitor/tray-monitor.c ./src/tray-monitor/tray_conf.c -./src/win32/compat/getopt.c -./src/win32/compat/winapi.c -./src/win32/scripts/bsleep.c -./src/wx-console/authenticate.c -./src/wx-console/console_conf.c -./autoconf/acconfig.h -./autoconf/confdefs.h -./src/cats/bdb.h -./src/cats/cats.h -./src/cats/protos.h -./src/cats/sql_cmds.h +./src/lib/btime.c +./src/lib/workq.c +./src/lib/uid_gid_name.c +./src/lib/cram-md5.c +./src/lib/mem_pool.c +./src/lib/hmac.c +./src/lib/bregex.c +./src/lib/crc32.c +./src/lib/util.c +./src/lib/dlist.c +./src/lib/message.c +./src/lib/md5.c +./src/lib/berrno.c +./src/lib/bnet.c +./src/lib/htable.c +./src/lib/bpipe.c +./src/lib/tree.c +./src/lib/watchdog.c +./src/lib/bsock.c +./src/lib/bsnprintf.c +./src/lib/btimers.c +./src/lib/pythonlib.c +./src/lib/enh_fnmatch.c +./src/lib/attr.c +./src/lib/jcr.c +./src/lib/parse_conf.c +./src/lib/idcache.c +./src/lib/scan.c +./src/lib/res.c +./src/lib/sha1.c +./src/lib/rblist.c +./src/lib/rwlock.c +./src/lib/daemon.c +./src/lib/alist.c +./src/lib/breg.c +./src/lib/serial.c +./src/lib/tls.c +./src/lib/signal.c +./src/lib/bnet_server.c +./src/lib/smartall.c +./src/lib/fnmatch.c +./src/lib/bsys.c +./src/lib/crypto.c +./src/lib/openssl.c +./src/lib/queue.c +./src/lib/base64.c +./src/lib/edit.c +./src/lib/bget_msg.c +./src/lib/lex.c +./src/lib/var.c +./src/lib/runscript.c +./src/lib/address_conf.c +./src/findlib/create_file.c +./src/findlib/attribs.c +./src/findlib/save-cwd.c +./src/findlib/fstype.c +./src/findlib/drivetype.c +./src/findlib/find.c +./src/findlib/find_one.c +./src/findlib/bfile.c +./src/findlib/enable_priv.c +./src/findlib/makepath.c +./src/findlib/match.c +./platforms/freebsd/tapetest.c +./src/dird/jobq.h +./src/dird/ua.h +./src/dird/dird.h +./src/dird/protos.h ./src/dird/bsr.h -./src/dird/dird.h ./src/dird/dird_conf.h -./src/dird/jobq.h -./src/dird/protos.h -./src/dird/ua.h -./src/baconfig.h -./src/bacula.h -./src/bc_types.h -./src/jcr.h -./src/version.h -./src/console/conio.h -./src/console/console_conf.h -./src/console/func.h ./src/filed/acl.h ./src/filed/filed.h +./src/filed/protos.h ./src/filed/filed_conf.h -./src/filed/protos.h -./src/findlib/bfile.h -./src/findlib/find.h -./src/findlib/protos.h -./src/findlib/save-cwd.h -./src/gnome2-console/callbacks.h +./src/qt-console/label/label.h +./src/qt-console/select/select.h +./src/qt-console/fileset/fileset.h +./src/qt-console/bcomm/dircomm.h +./src/qt-console/clients/clients.h +./src/qt-console/mount/mount.h +./src/qt-console/storage/storage.h +./src/qt-console/medialist/medialist.h +./src/qt-console/joblog/joblog.h +./src/qt-console/jobgraphs/jobplot.h +./src/qt-console/restore/restore.h +./src/qt-console/restore/restoretree.h +./src/qt-console/mediaedit/mediaedit.h +./src/qt-console/help/help.h +./src/qt-console/testprogs/putz/putz.h +./src/qt-console/testprogs/examp/mainwindow.h +./src/qt-console/jobs/jobs.h +./src/qt-console/console/console.h +./src/qt-console/run/run.h +./src/qt-console/joblist/joblist.h +./src/qt-console/relabel/relabel.h +./src/qt-console/mainwin.h +./src/qt-console/pages.h +./src/qt-console/bat.h +./src/qt-console/bat_conf.h +./src/qt-console/qstd.h +./src/gnome2-console/interface.h ./src/gnome2-console/console.h ./src/gnome2-console/console_conf.h -./src/gnome2-console/interface.h +./src/gnome2-console/support.h +./src/gnome2-console/callbacks.h ./src/gnome2-console/restore.h -./src/gnome2-console/support.h -./src/lib/address_conf.h -./src/lib/alist.h -./src/lib/attr.h -./src/lib/base64.h -./src/lib/berrno.h -./src/lib/bits.h -./src/lib/bpipe.h -./src/lib/bregex.h -./src/lib/bsock.h -./src/lib/btime.h -./src/lib/btimers.h -./src/lib/crypto.h -./src/lib/dlist.h -./src/lib/enh_fnmatch.h -./src/lib/fnmatch.h -./src/lib/htable.h -./src/lib/lex.h -./src/lib/lib.h -./src/lib/md5.h -./src/lib/mem_pool.h -./src/lib/message.h -./src/lib/openssl.h -./src/lib/parse_conf.h -./src/lib/protos.h -./src/lib/queue.h -./src/lib/rblist.h -./src/lib/runscript.h -./src/lib/rwlock.h -./src/lib/serial.h -./src/lib/sha1.h -./src/lib/smartall.h -./src/lib/tls.h -./src/lib/tree.h -./src/lib/var.h -./src/lib/waitq.h -./src/lib/watchdog.h -./src/lib/workq.h +./src/cats/cats.h +./src/cats/protos.h +./src/cats/sql_cmds.h +./src/cats/bdb.h +./src/wx-console/wxbtreectrl.h +./src/wx-console/wxbconfigpanel.h +./src/wx-console/console_conf.h +./src/wx-console/wxbhistorytextctrl.h +./src/wx-console/wxblistctrl.h +./src/wx-console/wxbrestorepanel.h +./src/wx-console/wxbtableparser.h +./src/wx-console/wx-console_private.h +./src/wx-console/console_thread.h +./src/wx-console/wxbconfigfileeditor.h +./src/wx-console/wxbmainframe.h +./src/wx-console/wxbutils.h +./src/wx-console/csprint.h ./src/stored/block.h +./src/stored/stored.h +./src/stored/stored_conf.h +./src/stored/reserve.h +./src/stored/lock.h +./src/stored/dev.h +./src/stored/record.h ./src/stored/bsr.h -./src/stored/dev.h ./src/stored/protos.h -./src/stored/record.h -./src/stored/reserve.h -./src/stored/stored.h -./src/stored/stored_conf.h -./src/tray-monitor/eggmarshalers.h -./src/tray-monitor/eggstatusicon.h -./src/tray-monitor/eggtrayicon.h -./src/tray-monitor/tray-monitor.h -./src/tray-monitor/tray_conf.h -./src/win32/winapi.h +./src/console/func.h +./src/console/conio.h +./src/console/console_conf.h +./src/win32/filed/vss.h +./src/win32/filed/who.h +./src/win32/wx-console/w32api.h +./src/win32/tools/ScsiDeviceList.h +./src/win32/dird/who.h ./src/win32/compat/arpa/inet.h -./src/win32/compat/sys/socket.h -./src/win32/compat/sys/file.h +./src/win32/compat/netinet/in.h ./src/win32/compat/sys/ioctl.h -./src/win32/compat/sys/mtio.h ./src/win32/compat/sys/stat.h ./src/win32/compat/sys/time.h +./src/win32/compat/sys/file.h ./src/win32/compat/sys/wait.h +./src/win32/compat/sys/mtio.h +./src/win32/compat/sys/socket.h +./src/win32/compat/strings.h +./src/win32/compat/pwd.h ./src/win32/compat/alloca.h -./src/win32/compat/compat.h -./src/win32/compat/dirent.h +./src/win32/compat/winhost.h +./src/win32/compat/netdb.h ./src/win32/compat/getopt.h -./src/win32/compat/grp.h +./src/win32/compat/stdint.h +./src/win32/compat/unistd.h ./src/win32/compat/mingwconfig.h +./src/win32/compat/mswinver.h +./src/win32/compat/winsock.h ./src/win32/compat/ms_atl.h -./src/win32/compat/mswinver.h -./src/win32/compat/netdb.h -./src/win32/compat/pwd.h -./src/win32/compat/stdint.h -./src/win32/compat/strings.h ./src/win32/compat/syslog.h -./src/win32/compat/unistd.h +./src/win32/compat/compat.h ./src/win32/compat/winconfig.h -./src/win32/compat/winhost.h -./src/win32/compat/winsock.h -./src/win32/compat/netinet/in.h -./src/win32/dird/winbacula.h -./src/win32/dird/winservice.h -./src/win32/filed/vss.h -./src/win32/libwin32/winabout.h -./src/win32/libwin32/winbacula.h -./src/win32/libwin32/winres.h -./src/win32/libwin32/winservice.h -./src/win32/libwin32/winstat.h +./src/win32/compat/dirent.h +./src/win32/compat/grp.h +./src/win32/libwin32/res.h +./src/win32/libwin32/aboutDialog.h ./src/win32/libwin32/wintray.h -./src/win32/stored/baculasd/winabout.h -./src/win32/stored/baculasd/winbacula.h -./src/win32/stored/baculasd/winres.h -./src/win32/stored/baculasd/winservice.h -./src/win32/stored/baculasd/winstat.h -./src/win32/stored/baculasd/wintray.h -./src/win32/tools/ScsiDeviceList.h -./src/win32/wx-console/w32api.h -./src/wx-console/console_conf.h -./src/wx-console/console_thread.h -./src/wx-console/csprint.h -./src/wx-console/wx-console_private.h -./src/wx-console/wxbconfigfileeditor.h -./src/wx-console/wxbconfigpanel.h -./src/wx-console/wxbhistorytextctrl.h -./src/wx-console/wxblistctrl.h -./src/wx-console/wxbmainframe.h -./src/wx-console/wxbrestorepanel.h -./src/wx-console/wxbtableparser.h -./src/wx-console/wxbtreectrl.h -./src/wx-console/wxbutils.h +./src/win32/libwin32/win32.h +./src/win32/libwin32/statusDialog.h +./src/win32/libwin32/protos.h +./src/win32/libwin32/trayMonitor.h +./src/win32/stored/who.h +./src/win32/winapi.h +./src/tray-monitor/tray-monitor.h +./src/tray-monitor/tray_conf.h +./src/lib/runscript.h +./src/lib/address_conf.h +./src/lib/tcpd.h +./src/lib/btime.h +./src/lib/bits.h +./src/lib/workq.h +./src/lib/mem_pool.h +./src/lib/bregex.h +./src/lib/dlist.h +./src/lib/message.h +./src/lib/md5.h +./src/lib/waitq.h +./src/lib/berrno.h +./src/lib/htable.h +./src/lib/bpipe.h +./src/lib/tree.h +./src/lib/watchdog.h +./src/lib/bsock.h +./src/lib/btimers.h +./src/lib/enh_fnmatch.h +./src/lib/attr.h +./src/lib/parse_conf.h +./src/lib/protos.h +./src/lib/sha1.h +./src/lib/rblist.h +./src/lib/rwlock.h +./src/lib/alist.h +./src/lib/breg.h +./src/lib/serial.h +./src/lib/tls.h +./src/lib/lib.h +./src/lib/smartall.h +./src/lib/fnmatch.h +./src/lib/crypto.h +./src/lib/openssl.h +./src/lib/queue.h +./src/lib/base64.h +./src/lib/lex.h +./src/lib/var.h +./src/findlib/save-cwd.h +./src/findlib/find.h +./src/findlib/bfile.h +./src/findlib/protos.h +./src/bc_types.h +./src/baconfig.h +./src/jcr.h +./src/version.h +./src/bacula.h ./src/host.h ./src/config.h -./src/win32/compat/compat.cpp -./src/win32/compat/print.cpp -./src/win32/dird/winmain.cpp -./src/win32/dird/winservice.cpp -./src/win32/filed/vss.cpp -./src/win32/filed/vss_W2K3.cpp -./src/win32/filed/vss_XP.cpp -./src/win32/filed/vss_generic.cpp -./src/win32/filed/winmain.cpp -./src/win32/filed/winservice.cpp -./src/win32/libwin32/winabout.cpp -./src/win32/libwin32/winstat.cpp -./src/win32/libwin32/wintray.cpp -./src/win32/stored/baculasd/winabout.cpp -./src/win32/stored/baculasd/winmain.cpp -./src/win32/stored/baculasd/winservice.cpp -./src/win32/stored/baculasd/winstat.cpp -./src/win32/stored/baculasd/wintray.cpp -./src/win32/stored/mtops.cpp -./src/win32/stored/postest/postest.cpp -./src/win32/tools/ScsiDeviceList.cpp -./src/win32/tools/scsilist.cpp -./src/wx-console/console_thread.cpp +./autoconf/acconfig.h +./autoconf/confdefs.h +./src/qt-console/label/label.cpp +./src/qt-console/select/select.cpp +./src/qt-console/fileset/fileset.cpp +./src/qt-console/bcomm/dircomm.cpp +./src/qt-console/bcomm/dircomm_auth.cpp +./src/qt-console/clients/clients.cpp +./src/qt-console/mount/mount.cpp +./src/qt-console/storage/storage.cpp +./src/qt-console/medialist/medialist.cpp +./src/qt-console/joblog/joblog.cpp +./src/qt-console/jobgraphs/jobplot.cpp +./src/qt-console/restore/restore.cpp +./src/qt-console/restore/restoretree.cpp +./src/qt-console/restore/brestore.cpp +./src/qt-console/restore/prerestore.cpp +./src/qt-console/mediaedit/mediaedit.cpp +./src/qt-console/help/help.cpp +./src/qt-console/testprogs/putz/putz.cpp +./src/qt-console/testprogs/putz/main.cpp +./src/qt-console/testprogs/examp/main.cpp +./src/qt-console/testprogs/examp/mainwindow.cpp +./src/qt-console/jobs/jobs.cpp +./src/qt-console/console/authenticate.cpp +./src/qt-console/console/console.cpp +./src/qt-console/run/run.cpp +./src/qt-console/run/runcmd.cpp +./src/qt-console/run/prune.cpp +./src/qt-console/run/estimate.cpp +./src/qt-console/joblist/joblist.cpp +./src/qt-console/relabel/relabel.cpp +./src/qt-console/pages.cpp +./src/qt-console/bat_conf.cpp +./src/qt-console/qstd.cpp +./src/qt-console/main.cpp +./src/qt-console/mainwin.cpp +./src/wx-console/wxbmainframe.cpp +./src/wx-console/wxbutils.cpp ./src/wx-console/main.cpp -./src/wx-console/wxbconfigfileeditor.cpp +./src/wx-console/wxbtreectrl.cpp ./src/wx-console/wxbconfigpanel.cpp ./src/wx-console/wxbhistorytextctrl.cpp ./src/wx-console/wxblistctrl.cpp -./src/wx-console/wxbmainframe.cpp ./src/wx-console/wxbrestorepanel.cpp ./src/wx-console/wxbtableparser.cpp -./src/wx-console/wxbtreectrl.cpp -./src/wx-console/wxbutils.cpp +./src/wx-console/console_thread.cpp +./src/wx-console/wxbconfigfileeditor.cpp +./src/win32/filed/service.cpp +./src/win32/filed/vss_Vista.cpp +./src/win32/filed/vss_W2K3.cpp +./src/win32/filed/vss_XP.cpp +./src/win32/filed/main.cpp +./src/win32/filed/trayMonitor.cpp +./src/win32/filed/vss_generic.cpp +./src/win32/filed/vss.cpp +./src/win32/tools/ScsiDeviceList.cpp +./src/win32/tools/scsilist.cpp +./src/win32/dird/service.cpp +./src/win32/dird/main.cpp +./src/win32/compat/compat.cpp +./src/win32/compat/print.cpp +./src/win32/libwin32/service.cpp +./src/win32/libwin32/statusDialog.cpp +./src/win32/libwin32/main.cpp +./src/win32/libwin32/trayMonitor.cpp +./src/win32/libwin32/aboutDialog.cpp +./src/win32/stored/postest/postest.cpp +./src/win32/stored/service.cpp +./src/win32/stored/mtops.cpp +./src/win32/stored/main.cpp +./src/win32/stored/trayMonitor.cpp Modified: trunk/bacula/po/README =================================================================== --- trunk/bacula/po/README 2007-08-30 14:22:48 UTC (rev 5416) +++ trunk/bacula/po/README 2007-08-30 16:19:42 UTC (rev 5417) @@ -10,17 +10,32 @@ To refresh bacula.pot and *.po, when some strings have been added, modified or removed from the sources files, run: + # make update-po --- To refresh Bacula source files list (POTFILES.in), when a source file is added or removed from the repository, run: + # make gen-potfiles && make update-po -Note, the make gen-potfiles should not be done very often, in fact, -it is probably better to edit POTFILES.in manually to prevent unwanted -files from getting in the list. +Note, the gen-potfiles pulls in all files found under the top +directory, so it is much better to do something like: + +cd bacula +rm -rf x +svn checkout https://bacula.svn.sourceforge.net/svnroot/bacula x +cd x +./configure <options> +cd po +make gen-potfiles +cp POTFILES.in <real-source-tree/po> +cd .. +./configure <options> + +This avoids picking up any files that are not in the SVN. + --- To add a new translation language (e.g. German), add a new line to LINGUAS Modified: trunk/bacula/po/bacula.pot =================================================================== --- trunk/bacula/po/bacula.pot 2007-08-30 14:22:48 UTC (rev 5416) +++ trunk/bacula/po/bacula.pot 2007-08-30 16:19:42 UTC (rev 5417) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bac...@li...\n" -"POT-Creation-Date: 2007-08-10 23:23+0200\n" +"POT-Creation-Date: 2007-08-30 17:34+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -16,901 +16,1054 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/cats/bdb.c:161 -msgid "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +#: patches/testing/bregsed.c:131 src/tools/bregtest.c:131 +#: src/tools/bwild.c:122 src/tools/bregex.c:147 +#, c-format +msgid "Could not open data file: %s\n" msgstr "" -#: src/cats/bdb.c:162 -msgid "WARNING!!!! The Internal Database is NOT OPERATIONAL!\n" +#: src/dird/next_vol.c:145 +#, c-format +msgid "Purging oldest volume \"%s\"\n" msgstr "" -#: src/cats/bdb.c:163 -msgid "You should use SQLite, PostgreSQL, or MySQL\n" +#: src/dird/next_vol.c:151 +#, c-format +msgid "Pruning oldest volume \"%s\"\n" msgstr "" -#: src/cats/bdb.c:185 src/cats/mysql.c:152 src/cats/postgresql.c:161 -#: src/cats/sqlite.c:160 +#: src/dird/next_vol.c:170 +msgid "We seem to be looping trying to find the next volume. I give up.\n" +msgstr "" + +#: src/dird/next_vol.c:196 #, c-format -msgid "Unable to initialize DB lock. ERR=%s\n" +msgid "Max Volume bytes exceeded. Marking Volume \"%s\" as Full.\n" msgstr "" -#: src/cats/bdb.c:195 +#: src/dird/next_vol.c:203 #, c-format -msgid "Unable to open Catalog DB control file %s: ERR=%s\n" +msgid "Volume used once. Marking Volume \"%s\" as Used.\n" msgstr "" -#: src/cats/bdb.c:250 +#: src/dird/next_vol.c:210 #, c-format -msgid "Error reading catalog DB control file. ERR=%s\n" +msgid "Max Volume jobs exceeded. Marking Volume \"%s\" as Used.\n" msgstr "" -#: src/cats/bdb.c:253 +#: src/dird/next_vol.c:217 #, c-format -msgid "" -"Error, catalog DB control file wrong version. Wanted %d, got %d\n" -"Please reinitialize the working directory.\n" +msgid "Max Volume files exceeded. Marking Volume \"%s\" as Used.\n" msgstr "" -#: src/cats/bdb_update.c:88 src/cats/bdb_update.c:119 +#: src/dird/next_vol.c:227 #, c-format -msgid "Error updating DB Job file. ERR=%s\n" +msgid "Max configured use duration exceeded. Marking Volume \"%s\" as Used.\n" msgstr "" -#: src/cats/bdb_update.c:158 src/cats/bdb_update.c:194 +#: src/dird/next_vol.c:237 #, c-format -msgid "Error updating DB Media file. ERR=%s\n" +msgid "Catalog error updating volume \"%s\". ERR=%s" msgstr "" -#: src/cats/mysql.c:82 -msgid "A user name for MySQL must be supplied.\n" +#: src/dird/next_vol.c:258 +msgid "volume has expired" msgstr "" -#: src/cats/mysql.c:190 +#: src/dird/next_vol.c:276 src/dird/next_vol.c:312 #, c-format -msgid "" -"Unable to connect to MySQL server.\n" -"Database=%s User=%s\n" -"MySQL connect failed either server not running or your authorization is " -"incorrect.\n" +msgid "Recycled current volume \"%s\"\n" msgstr "" -#: src/cats/mysql.c:367 src/cats/postgresql.c:304 src/cats/sqlite.c:351 -#, c-format -msgid "Query failed: %s: ERR=%s\n" +#: src/dird/next_vol.c:281 +msgid "and recycling of current volume failed" msgstr "" -#: src/cats/postgresql.c:85 -msgid "A user name for PostgreSQL must be supplied.\n" +#: src/dird/next_vol.c:287 +msgid "but should be Append, Purged or Recycle" msgstr "" -#: src/cats/postgresql.c:148 +#: src/dird/next_vol.c:315 msgid "" -"PostgreSQL configuration problem. PostgreSQL library is not thread safe. " -"Connot continue.\n" +"but should be Append, Purged or Recycle (recycling of the current volume " +"failed)" msgstr "" -#: src/cats/postgresql.c:198 -#, c-format +#: src/dird/next_vol.c:319 msgid "" -"Unable to connect to PostgreSQL server.\n" -"Database=%s User=%s\n" -"It is probably not running or your password is incorrect.\n" +"but should be Append, Purged or Recycle (cannot automatically recycle " +"current volume, as it still contains unpruned data or the Volume Retention " +"time has not expired.)" msgstr "" -#: src/cats/postgresql.c:590 +#: src/dird/next_vol.c:377 #, c-format -msgid "error fetching currval: %s\n" +msgid "Unable to get Pool record: ERR=%s" msgstr "" -#: src/cats/postgresql.c:682 src/cats/postgresql.c:729 +#: src/dird/next_vol.c:384 #, c-format -msgid "error ending batch mode: %s\n" +msgid "Unable add Scratch Volume, Pool \"%s\" full MaxVols=%d\n" msgstr "" -#: src/cats/sql.c:139 +#: src/dird/next_vol.c:403 #, c-format -msgid "" -"query %s failed:\n" -"%s\n" +msgid "Failed to move Scratch Volume. ERR=%s\n" msgstr "" -#: src/cats/sql.c:161 +#: src/dird/next_vol.c:408 #, c-format -msgid "" -"insert %s failed:\n" -"%s\n" +msgid "Using Volume \"%s\" from 'Scratch' pool.\n" msgstr "" -#: src/cats/sql.c:175 +#: src/dird/fd_cmds.c:94 src/tray-monitor/tray-monitor.c:929 +msgid "File daemon" +msgstr "" + +#: src/dird/fd_cmds.c:125 #, c-format -msgid "Insertion problem: affected_rows=%s\n" +msgid "File daemon \"%s\" rejected Job command: %s\n" msgstr "" -#: src/cats/sql.c:195 +#: src/dird/fd_cmds.c:138 #, c-format -msgid "" -"update %s failed:\n" -"%s\n" +msgid "Error updating Client record. ERR=%s\n" msgstr "" -#: src/cats/sql.c:205 +#: src/dird/fd_cmds.c:143 #, c-format -msgid "Update failed: affected_rows=%s for %s\n" +msgid "FD gave bad response to JobId command: %s\n" msgstr "" -#: src/cats/sql.c:226 +#: src/dird/fd_cmds.c:165 src/dird/fd_cmds.c:201 +msgid ", since=" +msgstr "" + +#: src/dird/fd_cmds.c:185 +msgid "No prior or suitable Full backup found in catalog. Doing FULL backup.\n" +msgstr "" + +#: src/dird/fd_cmds.c:186 src/dird/fd_cmds.c:194 #, c-format -msgid "" -"delete %s failed:\n" -"%s\n" +msgid " (upgraded from %s)" msgstr "" -#: src/cats/sql.c:252 src/cats/sql.c:259 src/cats/sql_create.c:1018 -#: src/cats/sql_get.c:185 src/cats/sql_get.c:236 src/cats/sql_get.c:604 -#: src/cats/sql_get.c:680 src/cats/sql_get.c:951 +#: src/dird/fd_cmds.c:192 #, c-format -msgid "error fetching row: %s\n" +msgid "Prior failed job found in catalog. Upgrading to %s.\n" msgstr "" -#: src/cats/sql.c:369 src/dird/catreq.c:404 src/dird/catreq.c:478 -#: src/dird/fd_cmds.c:638 src/dird/fd_cmds.c:696 +#: src/dird/fd_cmds.c:253 #, c-format -msgid "Attribute create error. %s" +msgid "Unimplemented backup level %d %c\n" msgstr "" -#: src/cats/sql.c:450 +#: src/dird/fd_cmds.c:356 src/filed/job.c:640 #, c-format -msgid "Path length is zero. File=%s\n" +msgid "Cannot run program: %s. ERR=%s\n" msgstr "" -#: src/cats/sql.c:494 -msgid "No results to list.\n" +#: src/dird/fd_cmds.c:367 src/dird/fd_cmds.c:392 src/dird/fd_cmds.c:406 +msgid ">filed: write error on socket\n" msgstr "" -#: src/cats/sql_create.c:95 +#: src/dird/fd_cmds.c:373 #, c-format -msgid "Create DB Job record %s failed. ERR=%s\n" +msgid "Error running program: %s. ERR=%s\n" msgstr "" -#: src/cats/sql_create.c:146 +#: src/dird/fd_cmds.c:382 #, c-format -msgid "Create JobMedia record %s failed: ERR=%s\n" +msgid "Cannot open included file: %s. ERR=%s\n" msgstr "" -#: src/cats/sql_create.c:155 +#: src/dird/fd_cmds.c:477 src/filed/job.c:1831 #, c-format -msgid "Update Media record %s failed: ERR=%s\n" +msgid "Could not open bootstrap file %s: ERR=%s\n" msgstr "" -#: src/cats/sql_create.c:185 +#: src/dird/fd_cmds.c:583 #, c-format -msgid "pool record %s already exists\n" +msgid "Client \"%s\" RunScript failed.\n" msgstr "" -#: src/cats/sql_create.c:212 +#: src/dird/fd_cmds.c:619 #, c-format -msgid "Create db Pool record %s failed: ERR=%s\n" +msgid "" +"<filed: bad attributes, expected 3 fields got %d\n" +"msglen=%d msg=%s\n" msgstr "" -#: src/cats/sql_create.c:243 +#: src/dird/fd_cmds.c:638 src/dird/fd_cmds.c:696 src/dird/catreq.c:404 +#: src/dird/catreq.c:478 src/cats/sql.c:369 #, c-format -msgid "Device record %s already exists\n" +msgid "Attribute create error. %s" msgstr "" -#: src/cats/sql_create.c:259 +#: src/dird/fd_cmds.c:674 #, c-format -msgid "Create db Device record %s failed: ERR=%s\n" +msgid "%s index %d not same as attributes %d\n" msgstr "" -#: src/cats/sql_create.c:292 +#: src/dird/fd_cmds.c:688 #, c-format -msgid "More than one Storage record!: %d\n" +msgid "<filed: Network error getting attributes. ERR=%s\n" msgstr "" -#: src/cats/sql_create.c:297 -#, c-format -msgid "error fetching Storage row: %s\n" +#: src/dird/ua_label.c:102 +msgid "Negative numbers not permitted\n" msgstr "" -#: src/cats/sql_create.c:317 -#, c-format -msgid "Create DB Storage record %s failed. ERR=%s\n" +#: src/dird/ua_label.c:108 +msgid "Range end is not integer.\n" msgstr "" -#: src/cats/sql_create.c:349 -#, c-format -msgid "mediatype record %s already exists\n" +#: src/dird/ua_label.c:113 +msgid "Range start is not an integer.\n" msgstr "" -#: src/cats/sql_create.c:365 -#, c-format -msgid "Create db mediatype record %s failed: ERR=%s\n" +#: src/dird/ua_label.c:119 +msgid "Range end not bigger than start.\n" msgstr "" -#: src/cats/sql_create.c:400 +#: src/dird/ua_label.c:125 +msgid "Input value is not an integer.\n" +msgstr "" + +#: src/dird/ua_label.c:131 +msgid "Values must be be greater than zero.\n" +msgstr "" + +#: src/dird/ua_label.c:135 +msgid "Slot too large.\n" +msgstr "" + +#: src/dird/ua_label.c:184 src/dird/ua_label.c:349 src/dird/ua_run.c:1199 +msgid "command line" +msgstr "" + +#: src/dird/ua_label.c:202 src/dird/ua_label.c:513 +msgid "No slots in changer to scan.\n" +msgstr "" + +#: src/dird/ua_label.c:214 src/dird/ua_label.c:524 +msgid "No Volumes found to label, or no barcodes.\n" +msgstr "" + +#: src/dird/ua_label.c:224 #, c-format -msgid "Volume \"%s\" already exists.\n" +msgid "Slot %d greater than max %d ignored.\n" msgstr "" -#: src/cats/sql_create.c:445 +#: src/dird/ua_label.c:253 #, c-format -msgid "Create DB Media record %s failed. ERR=%s\n" +msgid "No VolName for Slot=%d InChanger set to zero.\n" msgstr "" -#: src/cats/sql_create.c:493 +#: src/dird/ua_label.c:271 #, c-format -msgid "More than one Client!: %d\n" +msgid "Catalog record for Volume \"%s\" updated to reference slot %d.\n" msgstr "" -#: src/cats/sql_create.c:498 +#: src/dird/ua_label.c:275 #, c-format -msgid "error fetching Client row: %s\n" +msgid "Catalog record for Volume \"%s\" is up to date.\n" msgstr "" -#: src/cats/sql_create.c:525 +#: src/dird/ua_label.c:281 #, c-format -msgid "Create DB Client record %s failed. ERR=%s\n" +msgid "Volume \"%s\" not found in catalog. Slot=%d InChanger set to zero.\n" msgstr "" -#: src/cats/sql_create.c:568 +#: src/dird/ua_label.c:378 #, c-format -msgid "Create DB Counters record %s failed. ERR=%s\n" +msgid "" +"Volume \"%s\" has VolStatus %s. It must be Purged or Recycled before " +"relabeling.\n" msgstr "" -#: src/cats/sql_create.c:601 +#: src/dird/ua_label.c:394 +msgid "Enter new Volume name: " +msgstr "" + +#: src/dird/ua_label.c:407 #, c-format -msgid "More than one FileSet!: %d\n" +msgid "Media record for new Volume \"%s\" already exists.\n" msgstr "" -#: src/cats/sql_create.c:606 +#: src/dird/ua_label.c:425 +msgid "Enter slot (0 or Enter for none): " +msgstr "" + +#: src/dird/ua_label.c:453 #, c-format -msgid "error fetching FileSet row: ERR=%s\n" +msgid "Delete of Volume \"%s\" failed. ERR=%s" msgstr "" -#: src/cats/sql_create.c:636 +#: src/dird/ua_label.c:456 #, c-format -msgid "Create DB FileSet record %s failed. ERR=%s\n" +msgid "Old volume \"%s\" deleted from catalog.\n" msgstr "" -#: src/cats/sql_create.c:850 src/dird/job.c:131 src/dird/ua_output.c:628 +#: src/dird/ua_label.c:467 #, c-format -msgid "Could not open database \"%s\".\n" +msgid "Requesting to mount %s ...\n" msgstr "" -#: src/cats/sql_create.c:873 src/cats/sql_create.c:914 +#: src/dird/ua_label.c:489 +msgid "Do not forget to mount the drive!!!\n" +msgstr "" + +#: src/dird/ua_label.c:529 +msgid "" +"The following Volumes will be labeled:\n" +"Slot Volume\n" +"==============\n" +msgstr "" + +#: src/dird/ua_label.c:538 +msgid "Do you want to label these Volumes? (yes|no): " +msgstr "" + +#: src/dird/ua_label.c:559 #, c-format -msgid "Attempt to put non-attributes into catalog. Stream=%d\n" +msgid "Media record for Slot %d Volume \"%s\" already exists.\n" msgstr "" -#: src/cats/sql_create.c:978 +#: src/dird/ua_label.c:565 #, c-format -msgid "Create db File record %s failed. ERR=%s" +msgid "Error setting InChanger: ERR=%s" msgstr "" -#: src/cats/sql_create.c:1011 src/cats/sql_get.c:229 +#: src/dird/ua_label.c:588 #, c-format -msgid "More than one Path!: %s for path: %s\n" +msgid "Maximum pool Volumes=%d reached.\n" msgstr "" -#: src/cats/sql_create.c:1042 +#: src/dird/ua_label.c:595 #, c-format -msgid "Create db Path record %s failed. ERR=%s\n" +msgid "Catalog record for cleaning tape \"%s\" successfully created.\n" msgstr "" -#: src/cats/sql_create.c:1075 +#: src/dird/ua_label.c:602 #, c-format -msgid "More than one Filename! %s for file: %s\n" +msgid "Catalog error on cleaning tape: %s" msgstr "" -#: src/cats/sql_create.c:1081 +#: src/dird/ua_label.c:638 #, c-format -msgid "Error fetching row for file=%s: ERR=%s\n" +msgid "Illegal character \"%c\" in a volume name.\n" msgstr "" -#: src/cats/sql_create.c:1097 +#: src/dird/ua_label.c:645 src/dird/ua_cmds.c:295 +msgid "Volume name too long.\n" +msgstr "" + +#: src/dird/ua_label.c:651 src/dird/ua_cmds.c:299 src/lib/edit.c:459 +msgid "Volume name must be at least one character long.\n" +msgstr "" + +#: src/dird/ua_label.c:685 #, c-format -msgid "Create db Filename record %s failed. ERR=%s\n" +msgid "Sending relabel command from \"%s\" to \"%s\" ...\n" msgstr "" -#: src/cats/sql_delete.c:80 +#: src/dird/ua_label.c:692 #, c-format -msgid "No pool record %s exists\n" +msgid "Sending label command for Volume \"%s\" Slot %d ...\n" msgstr "" -#: src/cats/sql_delete.c:85 +#: src/dird/ua_label.c:733 #, c-format -msgid "Expecting one pool record, got %d\n" +msgid "Catalog record for Volume \"%s\", Slot %d successfully created.\n" msgstr "" -#: src/cats/sql_delete.c:91 +#: src/dird/ua_label.c:746 #, c-format -msgid "Error fetching row %s\n" +msgid "Label command failed for Volume %s.\n" msgstr "" -#: src/cats/sql_find.c:98 src/cats/sql_find.c:127 +#: src/dird/ua_label.c:756 #, c-format -msgid "" -"Query error for start time request: ERR=%s\n" -"CMD=%s\n" +msgid "Connecting to Storage daemon %s at %s:%d ...\n" msgstr "" -#: src/cats/sql_find.c:104 -msgid "No prior Full backup Job record found.\n" +#: src/dird/ua_label.c:759 src/dird/job.c:412 src/dird/ua_cmds.c:788 +#: src/dird/ua_cmds.c:1456 src/dird/ua_dotcmds.c:180 +msgid "Failed to connect to Storage daemon.\n" msgstr "" -#: src/cats/sql_find.c:116 +#: src/dird/ua_label.c:784 +msgid "Could not open SD socket.\n" +msgstr "" + +#: src/dird/ua_label.c:856 src/dird/ua_label.c:866 #, c-format -msgid "Unknown level=%d\n" +msgid "Invalid Slot number: %s\n" msgstr "" -#: src/cats/sql_find.c:133 +#: src/dird/ua_label.c:875 #, c-format -msgid "" -"No Job record found: ERR=%s\n" -"CMD=%s\n" +msgid "Invalid Volume name: %s\n" msgstr "" -#: src/cats/sql_find.c:232 +#: src/dird/ua_label.c:954 #, c-format -msgid "Unknown Job level=%d\n" +msgid "Device \"%s\" has %d slots.\n" msgstr "" -#: src/cats/sql_find.c:242 +#: src/dird/ua_label.c:1003 #, c-format -msgid "No Job found for: %s.\n" +msgid "Pool \"%s\" resource not found for volume \"%s\"!\n" msgstr "" -#: src/cats/sql_find.c:253 +#: src/dird/backup.c:87 src/dird/migrate.c:230 src/dird/migrate.c:231 +#: src/dird/job.c:868 src/dird/job.c:914 +msgid "Pool resource" +msgstr "" + +#: src/dird/backup.c:90 +msgid "No Storage specification found in Job or Pool.\n" +msgstr "" + +#: src/dird/backup.c:115 #, c-format -msgid "No Job found for: %s\n" +msgid "Start Backup JobId %s, Job=%s\n" msgstr "" -#: src/cats/sql_find.c:332 +#: src/dird/backup.c:286 #, c-format -msgid "Request for Volume item %d greater than max %d or less than 1\n" +msgid "Unexpected Client Job message: %s\n" msgstr "" -#: src/cats/sql_find.c:347 +#: src/dird/backup.c:295 #, c-format -msgid "No Volume record found for item %d.\n" +msgid "Network error with FD during %s: ERR=%s\n" msgstr "" -#: src/cats/sql_get.c:135 +#: src/dird/backup.c:313 +msgid "No Job status returned from FD.\n" +msgstr "" + +#: src/dird/backup.c:355 src/dird/migrate.c:1077 src/dird/admin.c:89 #, c-format -msgid "get_file_record want 1 got rows=%d\n" +msgid "Error getting Job record for Job report: ERR=%s" msgstr "" -#: src/cats/sql_get.c:140 +#: src/dird/backup.c:362 #, c-format -msgid "Error fetching row: %s\n" +msgid "Error getting Client record for Job report: ERR=%s" msgstr "" -#: src/cats/sql_get.c:148 +#: src/dird/backup.c:368 src/dird/migrate.c:1106 #, c-format -msgid "File record for PathId=%s FilenameId=%s not found.\n" +msgid "Error getting Media record for Volume \"%s\": ERR=%s" msgstr "" -#: src/cats/sql_get.c:154 -msgid "File record not found in Catalog.\n" +#: src/dird/backup.c:378 +msgid "Backup OK -- with warnings" msgstr "" -#: src/cats/sql_get.c:179 +#: src/dird/backup.c:380 src/stored/bscan.c:1124 +msgid "Backup OK" +msgstr "" + +#: src/dird/backup.c:385 src/stored/bscan.c:1128 +msgid "*** Backup Error ***" +msgstr "" + +#: src/dird/backup.c:395 src/stored/bscan.c:1131 +msgid "Backup Canceled" +msgstr "" + +#: src/dird/backup.c:405 src/dird/restore.c:279 src/dird/admin.c:109 #, c-format -msgid "More than one Filename!: %s for file: %s\n" +msgid "Inappropriate term code: %c\n" msgstr "" -#: src/cats/sql_get.c:189 +#: src/dird/backup.c:445 #, c-format -msgid "Get DB Filename record %s found bad record: %d\n" +msgid "" +"Bacula %s %s (%s): %s\n" +" Build OS: %s %s %s\n" +" JobId: %d\n" +" Job: %s\n" +" Backup Level: %s%s\n" +" Client: \"%s\" %s\n" +" FileSet: \"%s\" %s\n" +" Pool: \"%s\" (From %s)\n" +" Storage: \"%s\" (From %s)\n" +" Scheduled time: %s\n" +" Start time: %s\n" +" End time: %s\n" +" Elapsed time: %s\n" +" Priority: %d\n" +" FD Files Written: %s\n" +" SD Files Written: %s\n" +" FD Bytes Written: %s (%sB)\n" +" SD Bytes Written: %s (%sB)\n" +" Rate: %.1f KB/s\n" +" Software Compression: %s\n" +" VSS: %s\n" +" Encryption: %s\n" +" Volume name(s): %s\n" +" Volume Session Id: %d\n" +" Volume Session Time: %d\n" +" Last Volume Bytes: %s (%sB)\n" +" Non-fatal FD errors: %d\n" +" SD Errors: %d\n" +" FD termination status: %s\n" +" SD termination status: %s\n" +" Termination: %s\n" +"\n" msgstr "" -#: src/cats/sql_get.c:195 +#: src/dird/backup.c:541 #, c-format -msgid "Filename record: %s not found.\n" +msgid "Could not get Job Volume Parameters to update Bootstrap file. ERR=%s\n" msgstr "" -#: src/cats/sql_get.c:199 +#: src/dird/backup.c:575 #, c-format -msgid "Filename record: %s not found in Catalog.\n" +msgid "" +"Could not open WriteBootstrap file:\n" +"%s: ERR=%s\n" msgstr "" -#: src/cats/sql_get.c:240 +#: src/dird/ua_update.c:89 +msgid "Update choice:\n" +msgstr "" + +#: src/dird/ua_update.c:90 +msgid "Volume parameters" +msgstr "" + +#: src/dird/ua_update.c:91 +msgid "Pool from resource" +msgstr "" + +#: src/dird/ua_update.c:92 +msgid "Slots from autochanger" +msgstr "" + +#: src/dird/ua_update.c:93 +msgid "item" +msgstr "" + +#: src/dird/ua_update.c:93 +msgid "Choose catalog item to update" +msgstr "" + +#: src/dird/ua_update.c:133 #, c-format -msgid "Get DB path record %s found bad record: %s\n" +msgid "Invalid VolStatus specified: %s\n" msgstr "" -#: src/cats/sql_get.c:253 +#: src/dird/ua_update.c:142 #, c-format -msgid "Path record: %s not found.\n" +msgid "New Volume status is: %s\n" msgstr "" -#: src/cats/sql_get.c:257 +#: src/dird/ua_update.c:152 #, c-format -msgid "Path record: %s not found in Catalog.\n" +msgid "Invalid retention period specified: %s\n" msgstr "" -#: src/cats/sql_get.c:294 +#: src/dird/ua_update.c:160 #, c-format -msgid "No Job found for JobId %s\n" +msgid "New retention period is: %s\n" msgstr "" -#: src/cats/sql_get.c:363 src/cats/sql_get.c:419 +#: src/dird/ua_update.c:171 #, c-format -msgid "No volumes found for JobId=%d\n" +msgid "Invalid use duration specified: %s\n" msgstr "" -#: src/cats/sql_get.c:369 src/cats/sql_get.c:430 +#: src/dird/ua_update.c:179 #, c-format -msgid "Error fetching row %d: ERR=%s\n" +msgid "New use duration is: %s\n" msgstr "" -#: src/cats/sql_get.c:383 +#: src/dird/ua_update.c:193 #, c-format -msgid "No Volume for JobId %d found in Catalog.\n" +msgid "New max jobs is: %s\n" msgstr "" -#: src/cats/sql_get.c:520 +#: src/dird/ua_update.c:206 #, c-format -msgid "Pool id select failed: ERR=%s\n" +msgid "New max files is: %s\n" msgstr "" -#: src/cats/sql_get.c:557 +#: src/dird/ua_update.c:217 #, c-format -msgid "Client id select failed: ERR=%s\n" +msgid "Invalid max. bytes specif... [truncated message content] |